diff --git a/CHANGELOG.md b/CHANGELOG.md
index be95f310..005cfd19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ will consitute of a breaking change warranting a new major release:
 - Pointing control of the `AcsController` was still expecting submodes instead of modes.
 - Limitation of RW speeds was done before converting them to the correct unit scale.
 - The Syrlinks task now has a proper name instead of `MAIN_SPI`.
+- Make whole EIVE system initial transition work for the EM.
 
 # [v1.37.0] 2023-03-11
 
diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp
index 2959d42d..2210e1bb 100644
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@@ -209,7 +209,8 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio
       tmp.second->connectModeTreeParent(satsystem::tcs::SUBSYSTEM);
     }
   }
-  auto* camSwitcher = new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, power::NO_SWITCH);
+  auto* camSwitcher =
+      new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, pcdu::Switches::PDU2_CH8_PAYLOAD_CAMERA);
   camSwitcher->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
   auto* scexDummy = new ScexDummy(objects::SCEX, objects::DUMMY_COM_IF, comCookieDummy);
   scexDummy->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
diff --git a/fsfw b/fsfw
index 9a8d775e..8382d61b 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 9a8d775eb1a8788ad844215bf2a42d9f707767c0
+Subproject commit 8382d61b9206c0259439eeddcad3759f1cd9bd2f