diff --git a/cmake/scripts/RPi/create_cmake_debug_cfg.sh b/cmake/scripts/RPi/create_cmake_debug_cfg.sh
index deb78243..d0ec5d76 100644
--- a/cmake/scripts/RPi/create_cmake_debug_cfg.sh
+++ b/cmake/scripts/RPi/create_cmake_debug_cfg.sh
@@ -17,6 +17,7 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/raspberrypi"
 build_generator=""
+build_dir="Debug-RPi"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
 # Could be other OS but this works for now.
@@ -24,4 +25,5 @@ else
 	build_generator="Unix Makefiles"
 fi
 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}"
+python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "debug" -t "${tgt_bsp}" \
+		-l"${build_dir}"
diff --git a/cmake/scripts/RPi/create_cmake_release_cfg.sh b/cmake/scripts/RPi/create_cmake_release_cfg.sh
index 0e23bee4..4eb9b38a 100644
--- a/cmake/scripts/RPi/create_cmake_release_cfg.sh
+++ b/cmake/scripts/RPi/create_cmake_release_cfg.sh
@@ -17,6 +17,7 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/raspberrypi"
 build_generator=""
+build_dir="Release-RPi"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
 # Could be other OS but this works for now.
@@ -24,4 +25,5 @@ else
 	build_generator="Unix Makefiles"
 fi
 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}"
+python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "release" -t "${tgt_bsp}"  \
+		-l"${build_dir}"
diff --git a/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh b/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh
index 3e952750..de7651a7 100644
--- a/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh
+++ b/cmake/scripts/RPi/create_cmake_relwithdeb_cfg.sh
@@ -17,6 +17,7 @@ fi
 os_fsfw="linux"
 tgt_bsp="arm/raspberrypi"
 build_generator=""
+build_dir="RelWithDeb-RPi"
 if [ "${OS}" = "Windows_NT" ]; then
 	build_generator="MinGW Makefiles"
 # Could be other OS but this works for now.
@@ -24,4 +25,5 @@ else
 	build_generator="Unix Makefiles"
 fi
 
-python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -t "${tgt_bsp}"
+python3 cmake_build_config.py -o "${os_fsfw}" -g "${build_generator}" -b "reldeb" -t "${tgt_bsp}" \
+		-l"${build_dir}"
diff --git a/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake_build_config.py
index a6388ef8..0e4b6f25 100644
--- a/cmake/scripts/cmake_build_config.py
+++ b/cmake/scripts/cmake_build_config.py
@@ -61,9 +61,10 @@ def main():
     else:
         cmake_target_cfg_cmd = ""
 
-    # TODO: Use builddir if given (need to check whether path is relative or absolute)
     build_folder = cmake_build_type
-
+    if args.builddir is not None:
+        build_folder = args.builddir
+    
     build_path = source_location + os.path.sep + build_folder
     if os.path.isdir(build_path):
         remove_old_dir = input(f"{build_folder} folder already exists. Remove old directory? [y/n]: ")