diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66bb6c93..7540649a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ will consitute of a breaking change warranting a new major release:
 - Telemetry relevant datasets for the RWs are now set invalid and partially reset on shotdown.
 - I2C PST now has a polling frequency of 0.4 seconds instead of 0.2 seconds.
 - GS PST now has a polling frequency of 0.5 seconds instead of 1 second.
+- Bump FSFW: merged upstream.
 
 # [v1.37.2] 2023-03-14
 
diff --git a/fsfw b/fsfw
index cf27954a..43fd0b2f 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit cf27954a867a1c16b4e5b0fe72cd79df946ff903
+Subproject commit 43fd0b2f59c3aeb2d3f4db10cfad56ee3709d68d
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 8bf4eff6..53ca6904 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -112,8 +112,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
   }
 
   {
-    PoolManager::LocalPoolConfig poolCfg = {{600, 32},   {400, 64},   {400, 128}, {300, 512},
-                                            {250, 1024}, {150, 2048}};
+    PoolManager::LocalPoolConfig poolCfg = {{600, 32},  {400, 64},   {400, 128},
+                                            {300, 512}, {250, 1024}, {150, 2048}};
     *tmStore = new PoolManager(objects::TM_STORE, poolCfg);
   }
 
@@ -254,8 +254,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
                                    pus::PUS_SERVICE_20);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
                                 pus::PUS_SERVICE_200, 8);
-  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable,
-                             20);
+  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID,
+                             objects::HEALTH_TABLE, 20);
   new CServiceHealthCommanding(healthCfg);
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1