diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8e4aaca..cb7c3c65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,8 @@ will consitute of a breaking change warranting a new major release:
   sometimes blocking for a long time.
 - Request raw MTM measurement twice for IMTQ, might reduce number of times measurement could not
   be retrieved.
-
+- Event manager and event service have larger queues now: 45 -> 120 for Service 5, 80 -> 120 for
+  evebt manager
 # [v1.36.0] 2023-03-08
 
 eive-tmtc: v2.17.2
diff --git a/fsfw b/fsfw
index c162acb7..4d6f6e6b 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit c162acb7df6102e304057dcdda4fb93285052f03
+Subproject commit 4d6f6e6b23b5c0486dad6be8abba7681114a05fe
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index c6a3e216..e8eb9210 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -86,7 +86,7 @@ EiveFaultHandler EIVE_FAULT_HANDLER;
 void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFunnel** pusFunnel,
                                           CfdpTmFunnel** cfdpFunnel, SdCardMountedIF& sdcMan) {
   // Framework objects
-  new EventManager(objects::EVENT_MANAGER);
+  new EventManager(objects::EVENT_MANAGER, 120);
   auto healthTable = new HealthTable(objects::HEALTH_TABLE);
   if (healthTable_ != nullptr) {
     *healthTable_ = healthTable;
@@ -162,14 +162,14 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
 
   // PUS service stack
   new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION, config::EIVE_PUS_APID,
-                                      pus::PUS_SERVICE_1, objects::PUS_TM_FUNNEL, 20);
+                                      pus::PUS_SERVICE_1, objects::PUS_TM_FUNNEL, 40);
   new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS, config::EIVE_PUS_APID,
                            pus::PUS_SERVICE_2, 3, 10);
   new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, config::EIVE_PUS_APID,
                            pus::PUS_SERVICE_3);
   new Service5EventReporting(
       PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
-      15, 45);
+      15, 120);
   new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,
                                  pus::PUS_SERVICE_8, 16, 60);
   new Service9TimeManagement(
diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp
index 95effa7f..9b0c573a 100644
--- a/mission/system/tree/acsModeTree.cpp
+++ b/mission/system/tree/acsModeTree.cpp
@@ -196,7 +196,8 @@ void buildSafeSequence(Subsystem& ss, ModeListEntry& eh) {
     check(sequence.insert(eh), ctxc);
   };
   // Build SAFE target. Allow detumble submode.
-  iht(objects::ACS_CONTROLLER, acs::AcsMode::SAFE, 0, ACS_TABLE_SAFE_TGT.second, true);
+  iht(objects::ACS_CONTROLLER, acs::AcsMode::SAFE, acs::SafeSubmode::DEFAULT,
+      ACS_TABLE_SAFE_TGT.second, true);
   iht(objects::IMTQ_ASSY, NML, 0, ACS_TABLE_SAFE_TGT.second);
   iht(objects::SUS_BOARD_ASS, NML, 0, ACS_TABLE_SAFE_TGT.second, true);
   iht(objects::ACS_BOARD_ASS, NML, 0, ACS_TABLE_SAFE_TGT.second, true);