diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2df8a7826..3b772848c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -157,11 +157,7 @@ jobs:
         if: ${{ ! matrix.dry-run }}
         shell: cmd
         run: |
-          IF "%MATRIX_VS_VERSION%"=="2026" (
-            call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%"
-          ) ELSE (
-            call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%"
-          )
+          call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\%MATRIX_VCVARS%"
           uv run --no-dev build.py --python cpython-%MATRIX_PYTHON% --sh c:\cygwin\bin\sh.exe --options %MATRIX_BUILD_OPTIONS% --vs %MATRIX_VS_VERSION%
         env:
           MATRIX_VCVARS: ${{ matrix.vcvars }}
diff --git a/ci-runners.yaml b/ci-runners.yaml
index 91b0cbda5..b0dcaf17c 100644
--- a/ci-runners.yaml
+++ b/ci-runners.yaml
@@ -50,12 +50,7 @@ windows-2025-vs2026:
   platform: windows
   free: true
 
-github-windows-11-aarch64-8:
-  arch: aarch64
-  platform: windows
-  free: false
-
-windows-11-arm:
+windows-11-vs2026-arm:
   arch: aarch64
   platform: windows
   free: false