diff --git a/build/win64/build-debug.bat b/build/win64/build-debug.bat
index a04cb9984..fdcdce6b8 100644
--- a/build/win64/build-debug.bat
+++ b/build/win64/build-debug.bat
@@ -1,4 +1,3 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
-cd ..
+call msvc_include.bat
+%msbuild% /m /p:Platform=x64 /p:Configuration=RelWithDebInfo VC2022/ALL_BUILD.vcxproj
+
diff --git a/build/win64/build-release.bat b/build/win64/build-release.bat
index 8068e5074..39174794a 100644
--- a/build/win64/build-release.bat
+++ b/build/win64/build-release.bat
@@ -1,5 +1,3 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=Release ALL_BUILD.vcxproj
-cd ..
+call msvc_include.bat
+%msbuild% /m /p:Platform=x64 /p:Configuration=Release VC2022/ALL_BUILD.vcxproj
 pause
diff --git a/build/win64/generate-MSVC-all.bat b/build/win64/generate-MSVC-all.bat
index ea8db34c0..f43a03596 100644
--- a/build/win64/generate-MSVC-all.bat
+++ b/build/win64/generate-MSVC-all.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=1 -DBUILD_DEV_PLUGINS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/generate-MSVC-gui.bat b/build/win64/generate-MSVC-gui.bat
index cd18006d0..cd22c4e75 100644
--- a/build/win64/generate-MSVC-gui.bat
+++ b/build/win64/generate-MSVC-gui.bat
@@ -1,7 +1,5 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo Pre-generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
-cmake-gui .
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022  -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%"
+cmake-gui VC2022
diff --git a/build/win64/generate-MSVC-minimal.bat b/build/win64/generate-MSVC-minimal.bat
index 30e9b91ee..408b616ed 100644
--- a/build/win64/generate-MSVC-minimal.bat
+++ b/build/win64/generate-MSVC-minimal.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0
diff --git a/build/win64/generate-MSVC-release.bat b/build/win64/generate-MSVC-release.bat
index ef0b3dbbf..706b8c5a5 100644
--- a/build/win64/generate-MSVC-release.bat
+++ b/build/win64/generate-MSVC-release.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022  -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_DOCS=1 -DBUILD_STONESENSE=1
diff --git a/build/win64/generate-MSVC-testing.bat b/build/win64/generate-MSVC-testing.bat
index 57c0db06d..7e4d1f49d 100644
--- a/build/win64/generate-MSVC-testing.bat
+++ b/build/win64/generate-MSVC-testing.bat
@@ -1,6 +1,4 @@
 IF EXIST DF_PATH.txt SET /P _DF_PATH=<DF_PATH.txt
 IF NOT EXIST DF_PATH.txt SET _DF_PATH=%CD%\DF
-mkdir VC2022
-cd VC2022
 echo generating a build folder
-cmake ..\..\.. -G"Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_SUPPORTED=0 -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0 -DBUILD_SIZECHECK=1
+cmake ..\.. -G"Visual Studio 17 2022" -A x64 -B VC2022 -DCMAKE_INSTALL_PREFIX="%_DF_PATH%" -DBUILD_SUPPORTED=0 -DBUILD_DEVEL=0 -DBUILD_DEV_PLUGINS=0 -DBUILD_STONESENSE=0 -DBUILD_SIZECHECK=1
diff --git a/build/win64/install-debug.bat b/build/win64/install-debug.bat
index 2724990fc..2fc03eca1 100644
--- a/build/win64/install-debug.bat
+++ b/build/win64/install-debug.bat
@@ -1,4 +1,2 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo INSTALL.vcxproj
-cd ..
+call msvc_include.bat
+%msbuild% /m /p:Platform=x64 /p:Configuration=RelWithDebInfo VC2022/INSTALL.vcxproj
diff --git a/build/win64/install-release.bat b/build/win64/install-release.bat
index 30dc1f6ff..3194812b8 100644
--- a/build/win64/install-release.bat
+++ b/build/win64/install-release.bat
@@ -1,4 +1,2 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=Release INSTALL.vcxproj
-cd ..
+call msvc_include.bat
+%msbuild% /m /p:Platform=x64 /p:Configuration=Release VC2022/INSTALL.vcxproj
diff --git a/build/win64/msvc_include.bat b/build/win64/msvc_include.bat
new file mode 100644
index 000000000..0dbcc90cc
--- /dev/null
+++ b/build/win64/msvc_include.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+setlocal enabledelayedexpansion
+
+FOR /F "usebackq tokens=*" %%F IN (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -requires Microsoft.Component.MSBuild -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -version [17.0^,] -products * -find MSBuild\**\Bin\MSBuild.exe`) DO (
+    endlocal & set "MSBUILD="%%F""
+    goto :EOF
+)
+echo "Cannot find a Visual Studio 2022/Build Tools installation"
+exit 1
\ No newline at end of file
diff --git a/build/win64/package-debug.bat b/build/win64/package-debug.bat
index 450db0dfd..72ca65a0a 100644
--- a/build/win64/package-debug.bat
+++ b/build/win64/package-debug.bat
@@ -1,6 +1,3 @@
-@echo off
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo PACKAGE.vcxproj
-cd ..
+call msvc_include.bat
+%msbuild% /m /p:Platform=x64 /p:Configuration=RelWithDebInfo VC2022/PACKAGE.vcxproj
 exit %ERRORLEVEL%
diff --git a/build/win64/package-release.bat b/build/win64/package-release.bat
index 1c81ccf92..e796d6481 100644
--- a/build/win64/package-release.bat
+++ b/build/win64/package-release.bat
@@ -1,5 +1,2 @@
-@echo off
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-cd VC2022
-msbuild /m /p:Platform=x64 /p:Configuration=Release PACKAGE.vcxproj
-cd ..
+call msvc_include.bat
+%msbuild% /m /p:Platform=x64 /p:Configuration=Release VC2022/PACKAGE.vcxproj