diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 7f50d6bf..43b1da31 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -478,10 +478,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
                                      acsBoardHelper, gpioComIF);
   static_cast<void>(acsAss);
 #endif /* OBSW_ADD_ACS_HANDLERS == 1 */
-
-#if OBSW_USE_CCSDS_IP_CORE == 1
-  createCcsdsComponents(gpioComIF);
-#endif /* OBSW_USE_CCSDS_IP_CORE == 1 */
 }
 
 void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher,
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index bf0954cd..287740fa 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 210 translations.
  * @details
- * Generated on: 2022-07-08 16:45:10
+ * Generated on: 2022-08-08 17:10:35
  */
 #include "translateEvents.h"
 
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index 0868cdb0..9ccda325 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 134 translations.
- * Generated on: 2022-07-08 16:45:09
+ * Generated on: 2022-08-08 17:10:35
  */
 #include "translateObjects.h"
 
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index bf0954cd..287740fa 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 210 translations.
  * @details
- * Generated on: 2022-07-08 16:45:10
+ * Generated on: 2022-08-08 17:10:35
  */
 #include "translateEvents.h"
 
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index 0868cdb0..9ccda325 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 134 translations.
- * Generated on: 2022-07-08 16:45:09
+ * Generated on: 2022-08-08 17:10:35
  */
 #include "translateObjects.h"
 
diff --git a/scripts/install-obsw-yocto.sh b/scripts/install-obsw-yocto.sh
index 059d7244..c7880d2f 100755
--- a/scripts/install-obsw-yocto.sh
+++ b/scripts/install-obsw-yocto.sh
@@ -2,9 +2,11 @@
 # This is a helper script to install the compiles EIVE OBSW files
 # into the yocto repository to re-generate the mission root filesystem
 build_dir=cmake-build-release-q7s
+em_install="0"
 if [ ! -z ${1} ]; then
   if [[ "${1}" == "em" ]]; then
     echo "-I- Installing EM binaries"
+    em_install="1"
     build_dir=cmake-build-release-q7s-em
   fi
 fi
@@ -17,6 +19,13 @@ q7s_package_path="q7s-package/${q7s_yocto_dir}"
 
 obsw_version_filename="obsw_version.txt"
 yocto_obsw_path="yocto/meta-eive/recipes-core/eive-obsw/files"
+variant_specific_path=""
+if [ ${em_install} == "1" ]; then
+  variant_specific_path="${yocto_obsw_path}/em"
+else
+  variant_specific_path="${yocto_obsw_path}/fm"
+fi
+
 yocto_watchdog_path="yocto/meta-eive/recipes-support/eive-obsw-watchdog/files"
 obsw_bin_name="eive-obsw"
 watchdog_bin_name="eive-watchdog"
@@ -27,7 +36,7 @@ if [ ! -z ${EIVE_OBSW_ROOT} ]; then
 	cd ${EIVE_OBSW_ROOT}
   obsw_root=$(pwd)
 elif [ -d ${build_dir} ]; then
-  obsw_root=${build_dir}
+  obsw_root=$(pwd)
   :
 elif [ -d ../${build_dir} ]; then
   cd ..
@@ -66,10 +75,10 @@ fi
 if [ ! -f ${build_dir}/${obsw_bin_name} ]; then
   echo "-W- No EIVE OBSW binary found to intall to yocto"
 else
-  cp_cmd="cp $(pwd)/${build_dir}/${obsw_bin_name} ${yocto_root}/${yocto_obsw_path}/${obsw_target_name}"
+  cp_cmd="cp $(pwd)/${build_dir}/${obsw_bin_name} ${yocto_root}/${variant_specific_path}/${obsw_target_name}"
   echo "-I- Executing: ${cp_cmd}"
   eval ${cp_cmd}
-  cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${yocto_obsw_path}"
+  cp_ver_cmd="cp $(pwd)/${obsw_version_filename} ${yocto_root}/${variant_specific_path}"
   echo "-I- Executing: ${cp_ver_cmd}"
   eval ${cp_ver_cmd}
   echo "-I- Installed EIVE OBSW into yocto repository successfully"
diff --git a/tmtc b/tmtc
index 937eb482..6cb629c3 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 937eb4829883b17e3a7a842528675c3609e24768
+Subproject commit 6cb629c3c3ef0b109bc973e4b5b89ad176d373b3