diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3a55f2bc5..74c630cc0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -56,14 +56,12 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Build C++
       env:
-        SKIP_ARM_BUILD: 1
-        SKIP_ARM64_BUILD: 1
         PlatformToolset: v143
         VSTOOLS_VERSION: vs2022
         WindowsSDKVersion: 10.0.22621.0
       shell: cmd
       if: matrix.language == 'cpp'
-      run: build-all.bat
+      run: build-codeql-cpp.bat
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
diff --git a/build-codeql-cpp.bat b/build-codeql-cpp.bat
new file mode 100644
index 000000000..c33de9c7b
--- /dev/null
+++ b/build-codeql-cpp.bat
@@ -0,0 +1,15 @@
+@echo off
+
+cd %~dp0
+@setlocal ENABLEEXTENSIONS
+
+call tools\gen-version.cmd
+if errorLevel 1 goto end
+
+git -c submodule."lib/modules".update=none submodule update --init --recursive --depth=1
+if errorLevel 1 goto end
+
+call tools\RunMsBuild.bat x64 Release "sqlite:Rebuild,zlib:Rebuild,sqlite-uwp:Rebuild,win32-lib:Rebuild,win10-lib:Rebuild"
+
+:end
+exit /b %errorLevel%