diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index f3d7591d..da07b0b5 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -33,16 +33,14 @@ void Factory::setStaticFrameworkObjectIds(){
 	TmFunnel::storageDestination = objects::NO_OBJECT;
 
 	VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
-	TmPacketStored::timeStamperId = objects::TIME_STAMPER;
+	TmPacketBase::timeStamperId = objects::TIME_STAMPER;
 }
 
 void ObjectFactory::produce(){
 	Factory::setStaticFrameworkObjectIds();
 	ObjectFactory::produceGenericObjects();
 
-    new UdpTmTcBridge(objects::UDP_BRIDGE,
-            objects::CCSDS_PACKET_DISTRIBUTOR,
-            objects::TM_STORE, objects::TC_STORE);
+    new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
     new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
 }
diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h
index e3def8fe..3174d596 100644
--- a/bsp_hosted/fsfwconfig/FSFWConfig.h
+++ b/bsp_hosted/fsfwconfig/FSFWConfig.h
@@ -7,18 +7,17 @@
 //! Used to determine whether C++ ostreams are used which can increase
 //! the binary size significantly. If this is disabled,
 //! the C stdio functions can be used alternatively
-#define FSFW_CPP_OSTREAM_ENABLED    1
+#define FSFW_CPP_OSTREAM_ENABLED 	1
 
 //! More FSFW related printouts depending on level. Useful for development.
-#define FSFW_VERBOSE_LEVEL          1
+#define FSFW_VERBOSE_LEVEL			1
 
 //! Can be used to completely disable printouts, even the C stdio ones.
 #if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0
-    #define FSFW_DISABLE_PRINTOUT   0
+	#define FSFW_DISABLE_PRINTOUT 	0
 #endif
 
-//! Can be used to disable the ANSI color sequences for C stdio.
-#define FSFW_COLORED_OUTPUT         1
+#define FSFW_USE_PUS_C_TELEMETRY    1
 
 //! Can be used to disable the ANSI color sequences for C stdio.
 #define FSFW_COLORED_OUTPUT 		1
@@ -43,10 +42,17 @@
 //! Specify whether a special mode store is used for Subsystem components.
 #define FSFW_USE_MODESTORE          0
 
+//! Defines if the real time scheduler for linux should be used.
+//! If set to 0, this will also disable priority settings for linux
+//! as most systems will not allow to set nice values without privileges
+//! For embedded linux system set this to 1.
+//! If set to 1 the binary needs "cap_sys_nice=eip" privileges to run
+#define FSFW_USE_REALTIME_FOR_LINUX 0
+
 namespace fsfwconfig {
-//! Default timestamp size. The default timestamp will be an eight byte CDC
-//! short timestamp.
-static constexpr uint8_t FSFW_MISSION_TIMESTAMP_SIZE = 8;
+
+//! Default timestamp size. The default timestamp will be an seven byte CDC short timestamp.
+static constexpr uint8_t FSFW_MISSION_TIMESTAMP_SIZE = 7;
 
 //! Configure the allocated pool sizes for the event manager.
 static constexpr size_t FSFW_EVENTMGMR_MATCHTREE_NODES = 240;
@@ -55,11 +61,12 @@ static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS   = 120;
 
 //! Defines the FIFO depth of each commanding service base which
 //! also determines how many commands a CSB service can handle in one cycle
-//! simulataneously. This will increase the required RAM for
+//! simultaneously. This will increase the required RAM for
 //! each CSB service !
 static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
 
 static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124;
+
 }
 
 #endif /* CONFIG_FSFWCONFIG_H_ */
diff --git a/cmake/scripts/Linux/create_cmake_debug_cfg.sh b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
index 1f75c12a..172f890d 100755
--- a/cmake/scripts/Linux/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
@@ -16,7 +16,7 @@ fi
 
 build_generator="Unix Makefiles"
 os_fsfw="linux"
-builddir="Debug-Linux"
+builddir="build-Debug-Linux"
 
 echo "Running command (without the leading +):"
 set -x # Print command 
diff --git a/cmake/scripts/Linux/create_cmake_release_cfg.sh b/cmake/scripts/Linux/create_cmake_release_cfg.sh
index ffd85ae7..019a951d 100755
--- a/cmake/scripts/Linux/create_cmake_release_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_release_cfg.sh
@@ -16,7 +16,7 @@ fi
 
 build_generator="Unix Makefiles"
 os_fsfw="linux"
-builddir="Release-Linux"
+builddir="build-Release-Linux"
 
 echo "Running command (without the leading +):"
 set -x # Print command 
diff --git a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
deleted file mode 100755
index 31376322..00000000
--- a/cmake/scripts/Linux/create_cmake_relwithdeb_cfg.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-counter=0
-while [ ${counter} -lt 5 ]
-do
-	cd ..
-	if [ -f "cmake_build_config.py" ];then
-		break
-	fi
-	counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-	echo "create_cmake_cfg.sh not found in upper directories!"
-	exit 1
-fi
-
-build_generator="Unix Makefiles"
-os_fsfw="linux"
-builddir="RelWithDeb-Linux"
-
-echo "Running command (without the leading +):"
-set -x # Print command 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
-# Use this if commands are added which should not be printed
-# set +x
diff --git a/cmake/scripts/Linux/create_cmake_size_cfg.sh b/cmake/scripts/Linux/create_cmake_size_cfg.sh
deleted file mode 100755
index d4500d6d..00000000
--- a/cmake/scripts/Linux/create_cmake_size_cfg.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-counter=0
-while [ ${counter} -lt 5 ]
-do
-	cd ..
-	if [ -f "cmake_build_config.py" ];then
-		break
-	fi
-	counter=$((counter=counter + 1))
-done
-
-if [ "${counter}" -ge 5 ];then
-	echo "create_cmake_cfg.sh not found in upper directories!"
-	exit 1
-fi
-
-build_generator="Unix Makefiles"
-os_fsfw="linux"
-
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "size"