diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29da10da..ed144b38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ set(OBSW_ADD_TCS_CTRL
     1
     CACHE STRING "Add TCS controllers")
 set(OBSW_ADD_HEATERS
-    ${INIT_VAL}
+    1
     CACHE STRING "Add TCS heaters")
 set(OBSW_ADD_PLOC_SUPERVISOR
     ${INIT_VAL}
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 1f873b99..ad520441 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -137,8 +137,8 @@ void ObjectFactory::produce(void* args) {
                        pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
 #endif
   createAcsController(true, enableHkSets);
-  HeaterHandler* heaterHandler = nullptr;
-  ObjectFactory::createGenericHeaterComponents(*gpioComIF, *pwrSwitcher, heaterHandler);
+  HeaterHandler* heaterHandler;
+  createHeaterComponents(gpioComIF, pwrSwitcher, healthTable, heaterHandler);
   createThermalController(*heaterHandler);
   satsystem::init();
 }