diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 90d15015f60..5f83bcff07f 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -13,20 +13,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: "windows msvc"
+          - name: "windows msvc common only"
             os: windows-latest
-            target: surge-xt_Standalone
+            target: surge-common
             cmakeConfig: -A x64
             cmakeOpt: DEBUG
             runTests: false
 
-          - name: "windows msvc 32 bit"
-            os: windows-latest
-            target: surge-xt_Standalone
-            cmakeConfig: -A Win32
-            cmakeOpt: DEBUG
-            runTests: false
-
           - name: "windows clang"
             os: windows-latest
             target: surge-xt_Standalone
@@ -65,7 +58,7 @@ jobs:
           - name: "windows test runner"
             os: windows-latest
             target: surge-testrunner
-            cmakeConfig: -A x64
+            cmakeConfig: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
             cmakeOpt: RELEASE
             runTests: true
 
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 7bb8b7d7eee..8071aef3529 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -53,9 +53,7 @@ jobs:
           - os: windows-latest
             name: windows-64bit
             cmakeArgs: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
-          - os: windows-latest
-            name: windows-32bit
-            cmakeArgs: -A Win32
+
           - os: macos-latest
             name: macos
             cmakeArgs: -D"CMAKE_OSX_ARCHITECTURES=arm64;x86_64"