diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h
index 7e9b9f0..5bae107 100644
--- a/bsp_hosted/fsfwconfig/FSFWConfig.h
+++ b/bsp_hosted/fsfwconfig/FSFWConfig.h
@@ -17,7 +17,7 @@
     #define FSFW_DISABLE_PRINTOUT   0
 #endif
 
-#define FSFW_USE_PUS_C_TELEMETRY    0
+#define FSFW_USE_PUS_C_TELEMETRY    1
 
 //! Can be used to disable the ANSI color sequences for C stdio.
 #define FSFW_COLORED_OUTPUT         1
diff --git a/fsfw b/fsfw
index 097244b..08b9e92 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 097244bf8b429d1b107343a3dbd77fa537a9c86d
+Subproject commit 08b9e92d25bc78b68d7a101a2451c17def7c8d3b
diff --git a/generators/modgen b/generators/modgen
index 2dd83db..b2f7cb7 160000
--- a/generators/modgen
+++ b/generators/modgen
@@ -1 +1 @@
-Subproject commit 2dd83dbb458e19beec71877b969f287b03387af1
+Subproject commit b2f7cb79e9ab1f21748d84f3a7de8a0a75458531
diff --git a/mission/utility/TmFunnel.cpp b/mission/utility/TmFunnel.cpp
index 5579d18..b98c9e9 100644
--- a/mission/utility/TmFunnel.cpp
+++ b/mission/utility/TmFunnel.cpp
@@ -1,7 +1,7 @@
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
-#include <fsfw/tmtcpacket/pus/TmPacketBase.h>
+#include <fsfw/tmtcpacket/pus/TmPacketPusC.h>
 #include <mission/utility/TmFunnel.h>
 
 object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT;
@@ -50,7 +50,7 @@ ReturnValue_t TmFunnel::handlePacket(TmTcMessage* message) {
     if(result != HasReturnvaluesIF::RETURN_OK){
         return result;
     }
-    TmPacketBase packet(packetData);
+    TmPacketPusC packet(packetData);
     packet.setPacketSequenceCount(this->sourceSequenceCount);
     sourceSequenceCount++;
     sourceSequenceCount = sourceSequenceCount %
diff --git a/tmtc/config/hook_base.py b/tmtc/config/hook_base.py
index 6b04634..abd29c9 100644
--- a/tmtc/config/hook_base.py
+++ b/tmtc/config/hook_base.py
@@ -4,7 +4,6 @@ from typing import Dict, Union, Tuple
 from tmtccmd.core.hook_base import TmTcHookBase
 from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.pus_tm.service_3_base import Service3Base
-from tmtccmd.ecss.conf import PusVersion
 
 
 class FsfwHookBase(TmTcHookBase):
@@ -20,7 +19,7 @@ class FsfwHookBase(TmTcHookBase):
 
     def add_globals_pre_args_parsing(self, gui: bool = False):
         from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing
-        set_default_globals_pre_args_parsing(gui=gui, apid=0xef, pus_tm_version=PusVersion.PUS_A)
+        set_default_globals_pre_args_parsing(gui=gui, apid=0xef)
 
     def add_globals_post_args_parsing(self, args: argparse.Namespace, json_cfg_path: str = ""):
         from tmtccmd.defaults.globals_setup import set_default_globals_post_args_parsing