diff --git a/.github/actions/pandemonium-build-win-x86/action.yml b/.github/actions/pandemonium-build-win-x86/action.yml
new file mode 100644
index 000000000..5874b7437
--- /dev/null
+++ b/.github/actions/pandemonium-build-win-x86/action.yml
@@ -0,0 +1,39 @@
+name: Build Pandemonium Win x86
+description: Build Pandemonium with the provided options.
+inputs:
+  target:
+    description: The scons target (debug/release_debug/release).
+    default: "debug"
+  tools:
+    description: If tools are to be built.
+    default: false
+  tests:
+    description: If tests are to be built.
+    default: false
+  platform:
+    description: The Pandemonium platform to build.
+    required: false
+  sconsflags:
+    default: ""
+  scons-cache:
+    description: The scons cache path.
+    default: "${{ github.workspace }}/.scons-cache/"
+  scons-cache-limit:
+    description: The scons cache size limit.
+    # actions/cache has 10 GiB limit, and GitHub runners have a 14 GiB disk.
+    # Limit to 7 GiB to avoid having the extracted cache fill the disk.
+    default: 7168
+runs:
+  using: "composite"
+  steps:
+    - name: Scons Build
+      shell: sh
+      env:
+          SCONSFLAGS: ${{ inputs.sconsflags }}
+          SCONS_CACHE: ${{ inputs.scons-cache }}
+          SCONS_CACHE_LIMIT: ${{ inputs.scons-cache-limit }}
+      run: |
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86
+        echo "Building with flags:" ${{ env.SCONSFLAGS }}
+        scons p=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }}
+        ls -l bin/
diff --git a/.github/workflows/windows_x86_builds.yml b/.github/workflows/windows_x86_builds.yml
index f942ab180..b6e5d7e10 100644
--- a/.github/workflows/windows_x86_builds.yml
+++ b/.github/workflows/windows_x86_builds.yml
@@ -45,11 +45,6 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/pandemonium-deps
 
-      - name: Set up Visual Studio shell
-        uses: egor-tensin/vs-shell@v2
-        with:
-          arch: x86
-
       - name: Compilation
         uses: ./.github/actions/pandemonium-build
         with: