diff --git a/cmake/scripts/Hosted/create_cmake_debug_cfg.sh b/cmake/scripts/Hosted/cmake_release_cfg.sh
similarity index 62%
rename from cmake/scripts/Hosted/create_cmake_debug_cfg.sh
rename to cmake/scripts/Hosted/cmake_release_cfg.sh
index 5acad0f..4c5e29a 100755
--- a/cmake/scripts/Hosted/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/Hosted/cmake_release_cfg.sh
@@ -19,9 +19,15 @@ os_fsfw="host"
 builddir="build-Debug"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
+	python="py"
 # Could be other OS but this works for now.
 else
 	build_generator="Unix Makefiles"
+	python="python3"
 fi
 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -l "${builddir}"
+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}"
+# Use this if commands are added which should not be printed
+# set +x
diff --git a/cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/Hosted/make_debug_cfg.sh
similarity index 78%
rename from cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh
rename to cmake/scripts/Hosted/make_debug_cfg.sh
index 5260f1e..d3b3bf4 100755
--- a/cmake/scripts/Hosted/create_cmake_relwithdeb_cfg.sh
+++ b/cmake/scripts/Hosted/make_debug_cfg.sh
@@ -16,16 +16,18 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Release"
+builddir="build-Debug"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
+	python="py"
 # Could be other OS but this works for now.
 else
 	build_generator="Unix Makefiles"
+	python="python3"
 fi
 
 echo "Running command (without the leading +):"
 set -x # Print command 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -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/cmake/scripts/Hosted/create_cmake_release_cfg.sh b/cmake/scripts/Hosted/ninja_debug_cfg.sh
similarity index 53%
rename from cmake/scripts/Hosted/create_cmake_release_cfg.sh
rename to cmake/scripts/Hosted/ninja_debug_cfg.sh
index 1aaef15..85a6ada 100755
--- a/cmake/scripts/Hosted/create_cmake_release_cfg.sh
+++ b/cmake/scripts/Hosted/ninja_debug_cfg.sh
@@ -16,12 +16,17 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Release"
+builddir="build-Debug"
+build_generator="Ninja"
 if [ "${OS}" = "Windows_NT" ]; then
-	build_generator="MinGW Makefiles"
+    python="py"
 # Could be other OS but this works for now.
 else
-	build_generator="Unix Makefiles"
+    python="python3"
 fi
 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -l "${builddir}"
+echo "Running command (without the leading +):"
+set -x # Print command 
+"${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/cmake/scripts/Linux/make_reldef_cfg.sh b/cmake/scripts/Hosted/ninja_release_cfg.sh
similarity index 59%
rename from cmake/scripts/Linux/make_reldef_cfg.sh
rename to cmake/scripts/Hosted/ninja_release_cfg.sh
index 228df8a..e870b30 100755
--- a/cmake/scripts/Linux/make_reldef_cfg.sh
+++ b/cmake/scripts/Hosted/ninja_release_cfg.sh
@@ -14,13 +14,19 @@ if [ "${counter}" -ge 5 ];then
 	exit 1
 fi
 
-build_generator="Unix Makefiles"
-os_fsfw="linux"
+build_generator=""
+os_fsfw="host"
 builddir="build-Release"
+build_generator="Ninja"
+if [ "${OS}" = "Windows_NT" ]; then
+    python="py"
+# Could be other OS but this works for now.
+else
+    python="python3"
+fi
 
 echo "Running command (without the leading +):"
 set -x # Print command 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" \
-	-t "host/none" -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