diff --git a/CHANGELOG.md b/CHANGELOG.md
index ede02f9e..73b5f293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,8 @@ change warranting a new major release:
 
 - ACS Controller scheduling is now configurable via the `eive/definitions.h` file. Also ensured
   that scheduling is done in big blocks to reduce risk of missed deadlines.
-- Replaced chained locks for polling new sensor data to the `AcsController`
+- Replaced chained locks for polling new sensor data to the `AcsController`.
+- Made TM store even larger.
 
 ## Fixed
 
@@ -30,6 +31,10 @@ change warranting a new major release:
   needs to be declared volatile to avoid compiler optimizations.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/374
 
+## Added
+
+- Create TCS controller for EM build.
+
 # [v1.26.1] 2023-02-08
 
 - Initialize parameter helper in ACS controller.
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 832d082c..1627a858 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -112,5 +112,6 @@ void ObjectFactory::produce(void* args) {
                        pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
 #endif
   createAcsController(true);
+  createThermalController();
   satsystem::com::init();
 }
diff --git a/fsfw b/fsfw
index 84bbef01..6f05d6b7 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 84bbef016712096147e8cf3f2cec87f317d9e7e7
+Subproject commit 6f05d6b7b0ee0e6bc86986ec55491d42cde1cf93
diff --git a/linux/ipcore/PdecHandler.h b/linux/ipcore/PdecHandler.h
index 8e08adc8..32692dd8 100644
--- a/linux/ipcore/PdecHandler.h
+++ b/linux/ipcore/PdecHandler.h
@@ -87,8 +87,10 @@ class PdecHandler : public SystemObject, public ExecutableObjectIF, public HasAc
   static const Event LOST_CARRIER_LOCK_PDEC = MAKE_EVENT(5, severity::INFO);
   //! [EXPORT] : [COMMENT] Lost bit lock
   static const Event LOST_BIT_LOCK_PDEC = MAKE_EVENT(6, severity::INFO);
-  static constexpr Event POLL_SYSCALL_ERROR_PDEC = event::makeEvent(SUBSYSTEM_ID, 7, severity::MEDIUM);
-  static constexpr Event WRITE_SYSCALL_ERROR_PDEC = event::makeEvent(SUBSYSTEM_ID, 8, severity::MEDIUM);
+  static constexpr Event POLL_SYSCALL_ERROR_PDEC =
+      event::makeEvent(SUBSYSTEM_ID, 7, severity::MEDIUM);
+  static constexpr Event WRITE_SYSCALL_ERROR_PDEC =
+      event::makeEvent(SUBSYSTEM_ID, 8, severity::MEDIUM);
 
  private:
   static const uint8_t INTERFACE_ID = CLASS_ID::PDEC_HANDLER;
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index d486ed59..db529096 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -87,14 +87,14 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
   }
 
   {
-    PoolManager::LocalPoolConfig poolCfg = {{300, 16},  {350, 32},   {350, 64},
-                                            {200, 128}, {150, 1024}, {150, 2048}};
+    PoolManager::LocalPoolConfig poolCfg = {{400, 32},  {350, 64},   {200, 128},
+                                            {150, 512}, {150, 1024}, {150, 2048}};
     tmStore = new PoolManager(objects::TM_STORE, poolCfg);
   }
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{300, 16},  {200, 32}, {150, 64},  {150, 128},
-                                            {100, 256}, {50, 512}, {50, 1024}, {10, 2048}};
+                                            {100, 256}, {50, 512}, {50, 1024}, {50, 2048}};
     new PoolManager(objects::IPC_STORE, poolCfg);
   }