diff --git a/bsp_q7s/fmObjectFactory.cpp b/bsp_q7s/fmObjectFactory.cpp
index c56dcf8d..2814c3f9 100644
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@@ -33,8 +33,12 @@ void ObjectFactory::produce(void* args) {
 
   new CoreController(objects::CORE_CONTROLLER);
   createPcduComponents(gpioComIF, &pwrSwitcher);
+#if OBSW_ADD_RAD_SENSORS == 1
   createRadSensorComponent(gpioComIF);
+#endif
+#if OBSW_ADD_SUN_SENSORS == 1
   createSunSensorComponents(gpioComIF, spiMainComIF, pwrSwitcher, q7s::SPI_DEFAULT_DEV);
+#endif
 
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
diff --git a/tmtc b/tmtc
index 96e27e71..383b3214 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 96e27e716349bf01cac11c7e7b0b497a36149e87
+Subproject commit 383b32141c8c382b84c587d6814fe9252dde0b4a