diff --git a/common/config/eive/definitions.h b/common/config/eive/definitions.h
index 74208e25..50a70911 100644
--- a/common/config/eive/definitions.h
+++ b/common/config/eive/definitions.h
@@ -55,6 +55,7 @@ static constexpr uint32_t CFDP_STORE_QUEUE_SIZE = 300;
 
 static constexpr uint32_t MAX_PUS_FUNNEL_QUEUE_DEPTH = 100;
 static constexpr uint32_t MAX_CFDP_FUNNEL_QUEUE_DEPTH = 80;
+static constexpr uint32_t HK_SERVICE_QUEUE_DEPTH = 60;
 
 static constexpr uint32_t MAX_STORED_CMDS_UDP = 150;
 static constexpr uint32_t MAX_STORED_CMDS_TCP = 180;
diff --git a/fsfw b/fsfw
index b814e719..b31e1037 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit b814e7198f720cad0fb063f54644d5dbc92c165c
+Subproject commit b31e1037fb3d436e6a7f213050af8f64d194a85d
diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index 46a14daf..f93e4df6 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -234,7 +234,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
   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);
+                           pus::PUS_SERVICE_3, config::HK_SERVICE_QUEUE_DEPTH);
   new Service5EventReporting(
       PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
       40, 120);