diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh
index aa15333ac2..73d0f56ffd 100755
--- a/.ci/linux/build.sh
+++ b/.ci/linux/build.sh
@@ -36,15 +36,16 @@ case "$1" in
         ARCH=armv9
         ARCH_FLAGS="-march=armv9-a -mtune=generic -w"
         ;;
+    *)
+        echo "Invalid target $1 specified, must be one of amd64, steamdeck, allyx, rog-ally, legacy, aarch64, armv9"
+        exit 1
+        ;;
 esac
 
 export ARCH_FLAGS="$ARCH_FLAGS -O3"
 
-NPROC="$2"
 if [ -z "$NPROC" ]; then
     NPROC="$(nproc)"
-else
-    shift
 fi
 
 if [ "$1" != "" ]; then shift; fi
@@ -70,13 +71,16 @@ if [ "$USE_MULTIMEDIA" = "false" ]; then
     MULTIMEDIA=OFF
 else
     MULTIMEDIA=ON
+
+if [ -z "$BUILD_TYPE" ]; then
+    export BUILD_TYPE="Release"
 fi
 
 export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
 
 mkdir -p build && cd build
 cmake .. -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
 	-DENABLE_QT_TRANSLATION=ON \
     -DUSE_DISCORD_PRESENCE=ON \
     -DCMAKE_CXX_FLAGS="$ARCH_FLAGS" \
diff --git a/.ci/windows/build.sh b/.ci/windows/build.sh
index 667fd316fa..d0c697655a 100644
--- a/.ci/windows/build.sh
+++ b/.ci/windows/build.sh
@@ -17,6 +17,10 @@ else
     export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_BUNDLED_QT=OFF)
 fi
 
+if [ -z "$BUILD_TYPE" ]; then
+    export BUILD_TYPE="Release"
+fi
+
 if [ "$WINDEPLOYQT" == "" ]; then
     echo "You must supply the WINDEPLOYQT environment variable."
     exit 1
@@ -38,7 +42,7 @@ export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
 
 mkdir -p build && cd build
 cmake .. -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
 	-DENABLE_QT_TRANSLATION=ON \
     -DUSE_DISCORD_PRESENCE=ON \
     -DYUZU_USE_BUNDLED_SDL2=OFF \