diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
index c825536733..1e7cc9e15a 100644
--- a/.claude/CLAUDE.md
+++ b/.claude/CLAUDE.md
@@ -102,10 +102,10 @@ cmake --build ./build/ALL --target prepare_shaders
 
 # Fast shader-only deployment (no DLL build, no tests - for dev iteration)
 # See docs/development/shader-workflow.md for details
-cmake --build ./build/ALL-WITH-AUTO-DEPLOYMENT --target COPY_SHADERS
+cmake --build ./build/ALL --target COPY_SHADERS
 
 # Full deployment with DLL build and tests
-cmake --build ./build/ALL-WITH-AUTO-DEPLOYMENT --target DEPLOY_ALL
+cmake --build ./build/ALL --target DEPLOY_ALL
 
 # Create AIO zip package (when AIO_ZIP_TO_DIST=ON)
 cmake --build ./build/ALL --target AIO_ZIP_PACKAGE
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index b0033dc09e..c0c3b0e730 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -101,7 +101,7 @@ globals::d3d::*       // DirectX 11 device/context access
 ```bash
 # Fast shader deployment (dev iteration - no DLL build)
 # See docs/development/shader-workflow.md and docs/development/vscode-setup.md
-cmake --build ./build/ALL-WITH-AUTO-DEPLOYMENT --target COPY_SHADERS
+cmake --build ./build/ALL --target COPY_SHADERS
 
 # Shader validation (targeted testing recommended during development)
 cmake --build ./build/ALL --target prepare_shaders
diff --git a/BuildRelease.bat b/BuildRelease.bat
index eee1f2e84b..18946987f5 100755
--- a/BuildRelease.bat
+++ b/BuildRelease.bat
@@ -7,7 +7,7 @@ if NOT "%1" == "" (
 
 echo Running preset %preset%
 
-cmake -S . --preset=%preset% --check-stamp-file "build\%preset%\CMakeFiles\generate.stamp"
+cmake -S . --preset=%preset%
 if %ERRORLEVEL% NEQ 0 exit 1
 cmake --build --preset=%preset%
 if %ERRORLEVEL% NEQ 0 exit 1
diff --git a/CMakeUserPresets.json.template b/CMakeUserPresets.json.template
index 3e643c3aa1..a316db4344 100644
--- a/CMakeUserPresets.json.template
+++ b/CMakeUserPresets.json.template
@@ -3,6 +3,7 @@
 	"configurePresets": [
 		{
 			"name": "ALL-WITH-AUTO-DEPLOYMENT",
+			"binaryDir": "${sourceDir}/build/ALL",
 			"cacheVariables": {
 				"AUTO_PLUGIN_DEPLOYMENT": "ON"
 			},
diff --git a/docs/development/README.md b/docs/development/README.md
index 532dbccf19..ffdcc775e1 100644
--- a/docs/development/README.md
+++ b/docs/development/README.md
@@ -9,7 +9,7 @@
 
 ### Common Tasks
 
--   **Fast shader deployment:** `cmake --build build/ALL-WITH-AUTO-DEPLOYMENT --target COPY_SHADERS`
+-   **Fast shader deployment:** `cmake --build build/ALL --target COPY_SHADERS`
 -   **Full build with deployment:** `.\BuildRelease.bat ALL-WITH-AUTO-DEPLOYMENT`
 -   **Run tests:** `cmake --build build/ALL --target run_shader_tests`
 
diff --git a/docs/development/shader-workflow.md b/docs/development/shader-workflow.md
index 3d5179864b..f32233a73e 100644
--- a/docs/development/shader-workflow.md
+++ b/docs/development/shader-workflow.md
@@ -4,10 +4,10 @@
 
 ```bash
 # Fast shader-only deployment (recommended for dev iteration)
-cmake --build build/ALL-WITH-AUTO-DEPLOYMENT --target COPY_SHADERS
+cmake --build build/ALL --target COPY_SHADERS
 
 # Full deployment (DLL + tests + shaders)
-cmake --build build/ALL-WITH-AUTO-DEPLOYMENT --target DEPLOY_ALL
+cmake --build build/ALL --target DEPLOY_ALL
 ```
 
 ## Overview
@@ -28,12 +28,12 @@ Two deployment targets for different workflows:
 
 ```bash
 # Fast iteration: Only copy changed shaders to game directory
-cmake --build build/ALL-WITH-AUTO-DEPLOYMENT --target COPY_SHADERS
+cmake --build build/ALL --target COPY_SHADERS
 
 # Or in Visual Studio: Right-click "COPY_SHADERS" target -> Build
 
 # Full deployment (same as running cmake --build with no target):
-cmake --build build/ALL-WITH-AUTO-DEPLOYMENT --target DEPLOY_ALL
+cmake --build build/ALL --target DEPLOY_ALL
 ```
 
 #### Automatic (VSCode)
diff --git a/docs/development/vscode-setup.md b/docs/development/vscode-setup.md
index 4d268eea56..7122622582 100644
--- a/docs/development/vscode-setup.md
+++ b/docs/development/vscode-setup.md
@@ -37,7 +37,7 @@ Automatically deploy shaders when you save `.hlsl` or `.hlsli` files.
                     "match": "\\.(hlsl|hlsli)$",
                     "notMatch": "[\\\\\\/](build|extern|dist|Tests)[\\\\\\/]",
                     "isAsync": true,
-                    "cmd": "cmake --build ${workspaceFolder}/build/ALL-WITH-AUTO-DEPLOYMENT --target COPY_SHADERS",
+                    "cmd": "cmake --build ${workspaceFolder}/build/ALL --target COPY_SHADERS",
                     "runIn": "terminal",
                     "runningStatusMessage": "Deploying shaders...",
                     "finishStatusMessage": "Shaders deployed!"