diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63d9ad5..aa25ba8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,8 @@ configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
 
+set(FSFW_ADD_MONITORING ON)
+
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(WARNING_FLAGS
         -Wall
diff --git a/cmake/scripts/Hosted/cmake_release_cfg.sh b/cmake/scripts/Hosted/make_releae_cfg.sh
similarity index 91%
rename from cmake/scripts/Hosted/cmake_release_cfg.sh
rename to cmake/scripts/Hosted/make_releae_cfg.sh
index 4c5e29a..ab258c5 100755
--- a/cmake/scripts/Hosted/cmake_release_cfg.sh
+++ b/cmake/scripts/Hosted/make_releae_cfg.sh
@@ -16,7 +16,7 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Debug"
+builddir="build-Release"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
 	python="py"
@@ -28,6 +28,6 @@ fi
 
 echo "Running command (without the leading +):"
 set -x # Print command 
-"${python}" cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
+"${python}" 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/fsfw b/fsfw
index 66a79cb..ce93b92 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 66a79cb86c061a7113a43a21035f1fdb1e082729
+Subproject commit ce93b9220e4bc8002ca1d7608d64403052b8241a