diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 721c5338..35a0fff1 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -779,19 +779,19 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(CcsdsComponentArgs& args) {
                                 LINK_STATE);
   LogStores logStores(args.stores);
   // Core task which handles the LOG store and takes care of dumping it as TM using a VC directly
-  new PersistentLogTmStoreTask(objects::LOG_STORE_TASK, args.ipcStore, logStores, *vc,
+  new PersistentLogTmStoreTask(objects::LOG_STORE_AND_TM_TASK, args.ipcStore, logStores, *vc,
                                *SdCardManager::instance());
 
   vc = new VirtualChannel(objects::PTME_VC2_HK_TM, ccsds::VC2, "PTME VC2 HK TM", *ptme, LINK_STATE);
   // Core task which handles the HK store and takes care of dumping it as TM using a VC directly
-  new PersistentSingleTmStoreTask(objects::HK_STORE_TASK, args.ipcStore, *args.stores.hkStore, *vc,
-                                  *SdCardManager::instance());
+  new PersistentSingleTmStoreTask(objects::HK_STORE_AND_TM_TASK, args.ipcStore,
+                                  *args.stores.hkStore, *vc, *SdCardManager::instance());
 
   vc = new VirtualChannel(objects::PTME_VC3_CFDP_TM, ccsds::VC3, "PTME VC3 CFDP TM", *ptme,
                           LINK_STATE);
   // Core task which handles the CFDP store and takes care of dumping it as TM using a VC directly
-  new PersistentSingleTmStoreTask(objects::CFDP_STORE_TASK, args.ipcStore, *args.stores.cfdpStore,
-                                  *vc, *SdCardManager::instance());
+  new PersistentSingleTmStoreTask(objects::CFDP_STORE_AND_TM_TASK, args.ipcStore,
+                                  *args.stores.cfdpStore, *vc, *SdCardManager::instance());
 
   ReturnValue_t result = (*args.ipCoreHandler)->connectModeTreeParent(satsystem::com::SUBSYSTEM);
   if (result != returnvalue::OK) {
diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp
index ec47232d..9a7467b9 100644
--- a/bsp_q7s/core/scheduling.cpp
+++ b/bsp_q7s/core/scheduling.cpp
@@ -180,6 +180,32 @@ void scheduling::initTasks() {
   if (result != returnvalue::OK) {
     scheduling::printAddObjectError("PDEC Handler", objects::PDEC_HANDLER);
   }
+
+  // All the TM store tasks run in permanent loops, frequency does not matter
+  PeriodicTaskIF* liveTmTask =
+      factory->createPeriodicTask("LIVE_TM", 60, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, nullptr);
+  result = liveTmTask->addComponent(objects::LIVE_TM_TASK);
+  if (result != returnvalue::OK) {
+    scheduling::printAddObjectError("LIVE_TM", objects::LIVE_TM_TASK);
+  }
+  PeriodicTaskIF* logTmTask = factory->createPeriodicTask(
+      "LOG_STORE_AND_TM", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, nullptr);
+  result = logTmTask->addComponent(objects::LOG_STORE_AND_TM_TASK);
+  if (result != returnvalue::OK) {
+    scheduling::printAddObjectError("LOG_STORE_AND_TM", objects::LOG_STORE_AND_TM_TASK);
+  }
+  PeriodicTaskIF* hkTmTask = factory->createPeriodicTask(
+      "HK_STORE_AND_TM", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, nullptr);
+  result = hkTmTask->addComponent(objects::HK_STORE_AND_TM_TASK);
+  if (result != returnvalue::OK) {
+    scheduling::printAddObjectError("HK_STORE_AND_TM", objects::HK_STORE_AND_TM_TASK);
+  }
+  PeriodicTaskIF* cfdpTmTask = factory->createPeriodicTask(
+      "CFDP_STORE_AND_TM", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, nullptr);
+  result = cfdpTmTask->addComponent(objects::CFDP_STORE_AND_TM_TASK);
+  if (result != returnvalue::OK) {
+    scheduling::printAddObjectError("CFDP_STORE_AND_TM", objects::CFDP_STORE_AND_TM_TASK);
+  }
 #endif /* OBSW_ADD_CCSDS_IP_CORE == 1 */
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1
@@ -369,6 +395,10 @@ void scheduling::initTasks() {
   genericSysTask->startTask();
 #if OBSW_ADD_CCSDS_IP_CORES == 1
   pdecHandlerTask->startTask();
+  liveTmTask->startTask();
+  logTmTask->startTask();
+  hkTmTask->startTask();
+  cfdpTmTask->startTask();
 #endif /* OBSW_ADD_CCSDS_IP_CORES == 1 */
 
   coreCtrlTask->startTask();
diff --git a/common/config/eive/objects.h b/common/config/eive/objects.h
index f689caf9..00b509f2 100644
--- a/common/config/eive/objects.h
+++ b/common/config/eive/objects.h
@@ -169,9 +169,9 @@ enum commonObjects : uint32_t {
   CFDP_TM_STORE = 0x73030000,
 
   LIVE_TM_TASK = 0x73040000,
-  LOG_STORE_TASK = 0x73040001,
-  HK_STORE_TASK = 0x73040002,
-  CFDP_STORE_TASK = 0x73040003,
+  LOG_STORE_AND_TM_TASK = 0x73040001,
+  HK_STORE_AND_TM_TASK = 0x73040002,
+  CFDP_STORE_AND_TM_TASK = 0x73040003,
 
   // Other stuff
   THERMAL_TEMP_INSERTER = 0x90000003,