diff --git a/cmake/scripts/Linux/create_cmake_debug_cfg.sh b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
index 1207884e..8c626bf4 100755
--- a/cmake/scripts/Linux/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_debug_cfg.sh
@@ -17,9 +17,15 @@ fi
 build_generator="Unix Makefiles"
 os_fsfw="linux"
 builddir="build-Debug-Host"
+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 "debug" -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/Linux/create_cmake_release_cfg.sh b/cmake/scripts/Linux/create_cmake_release_cfg.sh
index 4412e671..95d87e70 100755
--- a/cmake/scripts/Linux/create_cmake_release_cfg.sh
+++ b/cmake/scripts/Linux/create_cmake_release_cfg.sh
@@ -17,9 +17,15 @@ fi
 build_generator="Unix Makefiles"
 os_fsfw="linux"
 builddir="build-Release-Host"
+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 "debug" -l "${builddir}"
+${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/RPi/make_reldeb_cfg.sh b/cmake/scripts/Q7S/ninja_debug_cfg.sh
similarity index 53%
rename from cmake/scripts/RPi/make_reldeb_cfg.sh
rename to cmake/scripts/Q7S/ninja_debug_cfg.sh
index de7651a7..2d3b333f 100755
--- a/cmake/scripts/RPi/make_reldeb_cfg.sh
+++ b/cmake/scripts/Q7S/ninja_debug_cfg.sh
@@ -15,15 +15,19 @@ if [ "${counter}" -ge 5 ];then
 fi
 
 os_fsfw="linux"
-tgt_bsp="arm/raspberrypi"
-build_generator=""
-build_dir="RelWithDeb-RPi"
+tgt_bsp="arm/q7s"
+build_dir="build-Debug-Q7S"
+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 "reldeb" -t "${tgt_bsp}" \
-		-l"${build_dir}"
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+	-l"${build_dir}"
+# set +x
+
diff --git a/cmake/scripts/RPi/make_debug_cfg.sh b/cmake/scripts/RPi/make_debug_cfg.sh
index 57561846..dbb178de 100755
--- a/cmake/scripts/RPi/make_debug_cfg.sh
+++ b/cmake/scripts/RPi/make_debug_cfg.sh
@@ -20,10 +20,16 @@ build_generator=""
 build_dir="build-Debug-RPi"
 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" -t "${tgt_bsp}" \
-		-l"${build_dir}"
+echo "Running command (without the leading +):"
+set -x # Print command 
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+	-l"${build_dir}"
+# set +x
+
diff --git a/cmake/scripts/RPi/ninja_debug_cfg.sh b/cmake/scripts/RPi/ninja_debug_cfg.sh
index c05ae446..3fa0e5f4 100755
--- a/cmake/scripts/RPi/ninja_debug_cfg.sh
+++ b/cmake/scripts/RPi/ninja_debug_cfg.sh
@@ -18,6 +18,16 @@ os_fsfw="linux"
 tgt_bsp="arm/raspberrypi"
 build_generator="Ninja"
 build_dir="build-Debug-RPi"
+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 
+${python} cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+	-l"${build_dir}"
+# set +x
 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
-		-l"${build_dir}"