diff --git a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h
index 1c39b0ac..c6104f76 100644
--- a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h
+++ b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h
@@ -77,6 +77,7 @@ enum PoolIds : lp_id_t {
 
 static const uint8_t ENTRIES_SENSOR_TEMPERATURE_SET = 18;
 static const uint8_t ENTRIES_DEVICE_TEMPERATURE_SET = 25;
+static const uint8_t ENTRIES_SUS_TEMPERATURE_SET = 12;
 
 /**
  * @brief   This dataset can be used to store the collected temperatures of all temperature sensors
@@ -159,7 +160,7 @@ class DeviceTemperatures : public StaticLocalDataSet<ENTRIES_DEVICE_TEMPERATURE_
  * @brief   This dataset can be used to store the collected temperatures of all SUS temperature
  * sensors
  */
-class SusTemperatures : public StaticLocalDataSet<12> {
+class SusTemperatures : public StaticLocalDataSet<ENTRIES_SUS_TEMPERATURE_SET> {
  public:
   SusTemperatures(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, SUS_TEMPERATURES) {}
 
diff --git a/tmtc b/tmtc
index 38b8f2a0..8a23e8a9 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 38b8f2a02f4bfe4909dfe97f37ed95c3d67648dc
+Subproject commit 8a23e8a96c5adda158f03c3924bd9c2746daad9b