diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml
index 6c718f9e3..7ca7db37a 100644
--- a/.github/actions/setup-dependencies/action.yml
+++ b/.github/actions/setup-dependencies/action.yml
@@ -56,7 +56,9 @@ runs:
     # TODO(@getchoo): Get this working on MSYS2!
     - name: Setup ccache
       if: ${{ (runner.os != 'Windows' || inputs.msystem == '') && inputs.build-type == 'Debug' }}
-      uses: hendrikmuhs/ccache-action@v1.2.18
+      # TODO(@getchoo): Un-pin when this commit makes it to a stable release!
+      # Needed to support the native Windows ARM runner
+      uses: hendrikmuhs/ccache-action@1eaec4d0426ec8b42d342bf1e7b56fd3660a8fd9
       with:
         variant: sccache
         create-symlink: ${{ runner.os != 'Windows' }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b8ba57a45..23e046f19 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,11 +107,10 @@ jobs:
             # TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?!
             vcvars-arch: amd64
 
-          - os: windows-2022
+          - os: windows-11-arm
             artifact-name: Windows-MSVC-arm64
-            base-cmake-preset: windows_msvc_arm64_cross
-            vcvars-arch: amd64_arm64
-            qt-architecture: win64_msvc2022_arm64_cross_compiled
+            base-cmake-preset: windows_msvc
+            vcvars-arch: arm64
 
           - os: macos-14
             artifact-name: macOS