diff --git a/linux/payload/PlocSupervisorHandler.cpp b/archive/PlocSupervisorHandler.cpp
similarity index 100%
rename from linux/payload/PlocSupervisorHandler.cpp
rename to archive/PlocSupervisorHandler.cpp
diff --git a/linux/payload/PlocSupervisorHandler.h b/archive/PlocSupervisorHandler.h
similarity index 100%
rename from linux/payload/PlocSupervisorHandler.h
rename to archive/PlocSupervisorHandler.h
diff --git a/bsp_q7s/objectFactory.cpp b/bsp_q7s/objectFactory.cpp
index eadf70c6..258703c9 100644
--- a/bsp_q7s/objectFactory.cpp
+++ b/bsp_q7s/objectFactory.cpp
@@ -13,7 +13,6 @@
 #include <linux/payload/PlocMemoryDumper.h>
 #include <linux/payload/PlocMpsocHandler.h>
 #include <linux/payload/PlocMpsocSpecialComHelper.h>
-#include <linux/payload/PlocSupervisorHandler.h>
 #include <linux/payload/ScexUartReader.h>
 #include <linux/payload/plocMpsocHelpers.h>
 #include <linux/power/CspComIF.h>
@@ -60,6 +59,7 @@
 #include "linux/ipcore/PdecHandler.h"
 #include "linux/ipcore/Ptme.h"
 #include "linux/ipcore/PtmeConfig.h"
+#include "linux/payload/FreshSupvHandler.h"
 #include "mission/config/configfile.h"
 #include "mission/system/acs/AcsBoardFdir.h"
 #include "mission/system/acs/AcsSubsystem.h"
@@ -651,10 +651,11 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwit
                        supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
   supervisorCookie->setNoFixedSizeReply();
   auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
-  auto* supvHandler = new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie,
-                                                Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
-                                                power::PDU1_CH6_PLOC_12V, *supvHelper);
-  supvHandler->setPowerSwitcher(&pwrSwitch);
+
+  DhbConfig dhbConf(objects::PLOC_SUPERVISOR_HANDLER);
+  auto* supvHandler =
+      new FreshSupvHandler(dhbConf, supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
+                           pwrSwitch, power::PDU1_CH6_PLOC_12V, *supvHelper);
   supvHandler->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
   static_cast<void>(consumer);
diff --git a/bsp_q7s/scheduling.cpp b/bsp_q7s/scheduling.cpp
index 3c30e91a..b4344db2 100644
--- a/bsp_q7s/scheduling.cpp
+++ b/bsp_q7s/scheduling.cpp
@@ -383,11 +383,12 @@ void scheduling::initTasks() {
   }
 #endif /* OBSW_ADD_PLOC_SUPERVISOR */
 
-  PeriodicTaskIF* plTask = factory->createPeriodicTask(
+  FixedTimeslotTaskIF* plTask = factory->createFixedTimeslotTask(
       "PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.5, missedDeadlineFunc, &RR_SCHEDULING);
-  plTask->addComponent(objects::CAM_SWITCHER);
-  scheduling::addMpsocSupvHandlers(plTask);
-  scheduling::scheduleScexDev(plTask);
+  // plTask->addComponent(objects::CAM_SWITCHER);
+  // scheduling::addMpsocSupvHandlers(plTask);
+  // scheduling::scheduleScexDev(plTask);
+  pst::pstPayload(plTask);
 
 #if OBSW_ADD_SCEX_DEVICE == 1
   PeriodicTaskIF* scexReaderTask;
diff --git a/linux/payload/CMakeLists.txt b/linux/payload/CMakeLists.txt
index 09062532..48fb9d96 100644
--- a/linux/payload/CMakeLists.txt
+++ b/linux/payload/CMakeLists.txt
@@ -5,7 +5,6 @@ target_sources(
          FreshSupvHandler.cpp
          PlocMpsocSpecialComHelper.cpp
          plocMpsocHelpers.cpp
-         PlocSupervisorHandler.cpp
          PlocSupvUartMan.cpp
          ScexDleParser.cpp
          ScexHelper.cpp
diff --git a/linux/payload/FreshSupvHandler.cpp b/linux/payload/FreshSupvHandler.cpp
index b0846dd2..798fb652 100644
--- a/linux/payload/FreshSupvHandler.cpp
+++ b/linux/payload/FreshSupvHandler.cpp
@@ -82,7 +82,7 @@ void FreshSupvHandler::performDeviceOperation(uint8_t opCode) {
         }
       }
     }
-  } else if (opCode == OpCode::HANDLE_ACTIVE_CMDS) {
+  } else if (opCode == OpCode::PARSE_TM) {
     std::vector<ActionId_t> cmdsToRemove;
     for (auto& activeCmd : activeActionCmds) {
       if (activeCmd.second.cmdCountdown.hasTimedOut()) {
diff --git a/linux/payload/FreshSupvHandler.h b/linux/payload/FreshSupvHandler.h
index 6f7d7af2..0f190a1d 100644
--- a/linux/payload/FreshSupvHandler.h
+++ b/linux/payload/FreshSupvHandler.h
@@ -19,7 +19,7 @@ static constexpr bool REDUCE_NORMAL_MODE_PRINTOUT = true;
 
 class FreshSupvHandler : public FreshDeviceHandlerBase {
  public:
-  enum OpCode { DEFAULT_OPERATION = 0, HANDLE_ACTIVE_CMDS = 1 };
+  enum OpCode { DEFAULT_OPERATION = 0, PARSE_TM = 1 };
 
   FreshSupvHandler(DhbConfig cfg, CookieIF* comCookie, Gpio uartIsolatorSwitch,
                    PowerSwitchIF& switchIF, power::Switch_t powerSwitch,
diff --git a/linux/payload/PlocSupvUartMan.cpp b/linux/payload/PlocSupvUartMan.cpp
index 1a129927..00a90fa3 100644
--- a/linux/payload/PlocSupvUartMan.cpp
+++ b/linux/payload/PlocSupvUartMan.cpp
@@ -24,6 +24,7 @@
 #include "mission/utility/Filenaming.h"
 #include "mission/utility/ProgressPrinter.h"
 #include "mission/utility/Timestamp.h"
+#include "tas/crc.h"
 
 using namespace returnvalue;
 using namespace supv;
diff --git a/linux/payload/PlocSupvUartMan.h b/linux/payload/PlocSupvUartMan.h
index dc06b199..2da9a8b9 100644
--- a/linux/payload/PlocSupvUartMan.h
+++ b/linux/payload/PlocSupvUartMan.h
@@ -16,7 +16,6 @@
 #include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
-#include "tas/crc.h"
 
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/SdCardManager.h"
diff --git a/mission/pollingSeqTables.cpp b/mission/pollingSeqTables.cpp
index e9adf83b..8bd0bb86 100644
--- a/mission/pollingSeqTables.cpp
+++ b/mission/pollingSeqTables.cpp
@@ -9,6 +9,8 @@
 
 #include "OBSWConfig.h"
 #include "eive/definitions.h"
+#include "eive/objects.h"
+#include "linux/payload/FreshSupvHandler.h"
 
 #ifndef RPI_TEST_ADIS16507
 #define RPI_TEST_ADIS16507 0
@@ -608,3 +610,24 @@ ReturnValue_t pst::pstTcsAndAcs(FixedTimeslotTaskIF *thisSequence, AcsPstCfg cfg
                         0);
   return returnvalue::OK;
 }
+ReturnValue_t pst::pstPayload(FixedTimeslotTaskIF *thisSequence) {
+  uint32_t length = thisSequence->getPeriodMs();
+
+  thisSequence->addSlot(objects::CAM_SWITCHER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0,
+                        DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::GET_READ);
+
+  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0,
+                        FreshSupvHandler::OpCode::DEFAULT_OPERATION);
+  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.1,
+                        FreshSupvHandler::OpCode::PARSE_TM);
+  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.2,
+                        FreshSupvHandler::OpCode::PARSE_TM);
+  static_cast<void>(length);
+
+  return thisSequence->checkSequence();
+}
diff --git a/mission/pollingSeqTables.h b/mission/pollingSeqTables.h
index 5df3c954..db75de88 100644
--- a/mission/pollingSeqTables.h
+++ b/mission/pollingSeqTables.h
@@ -63,6 +63,8 @@ ReturnValue_t pstTcsAndAcs(FixedTimeslotTaskIF* thisSequence, AcsPstCfg cfg);
 
 ReturnValue_t pstI2c(TmpSchedConfig schedConf, FixedTimeslotTaskIF* thisSequence);
 
+ReturnValue_t pstPayload(FixedTimeslotTaskIF* thisSequence);
+
 /**
  * Generic test PST
  * @param thisSequence