diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f3b19ef7a..8e4d47f0e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -367,10 +367,6 @@ jobs:
           - { arch: arm64, qt: '5.13.2' }
           - { arch: arm64, qt: '5.14.2' }
           - { arch: arm64, qt: '5.15.2' }
-          # Also exclude arm64 for Qt 6.8+ for now, as Qt 6.8 is moving to native-only (not cross-compiling) arm64 on
-          # Windows (https://www.qt.io/blog/qt-for-windows-on-arm-may21-update) and there are not compatible runners.
-          - { arch: arm64, qt: '6.8.1' } # \todo Qt 6.8.1 might have restored cross-compilation.
-          - { arch: arm64, qt: '6.9.0' } # \todo Qt 6.9.0 might have restored cross-compilation.
           # Exclude MinGW (including LLVM) builds for arm64, since Qt does not provide those binaries yet.
           - { arch: arm64, toolchain: llvm }
           - { arch: arm64, toolchain: mingw }
@@ -469,9 +465,11 @@ jobs:
           - { qt: '6.7.3',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2019_64 }
           # { qt: '6.8.1',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
           - { qt: '6.8.1',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          - { qt: '6.8.1',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
           - { qt: '6.8.1',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
           # { qt: '6.9.0',   toolchain: llvm,  arch: x86-64, aqtArch: win64_llvm_mingw } \todo See temp exclusion above.
           - { qt: '6.9.0',   toolchain: mingw, arch: x86-64, aqtArch: win64_mingw }
+          - { qt: '6.9.0',   toolchain: msvc,  arch: arm64,  aqtArch: win64_msvc2022_arm64_cross_compiled }
           - { qt: '6.9.0',   toolchain: msvc,  arch: x86-64, aqtArch: win64_msvc2022_64 }
           # Map the MSVC architecture.
           - { toolchain: msvc, arch: arm64,  msvcArch: amd64_arm64 }
@@ -512,7 +510,7 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt }}
-          arch: win64_msvc2019_64
+          arch: ${{ startsWith(matrix.aqtArch, 'win64_msvc2019') && 'win64_msvc2019' || 'win64_msvc2022' }}_64
           set-env: false
           # \todo Use aqtinstall HEAD for Qt 6.8.1 and 6.9.0 support, until the fix for #843 is released (presumably in
           # aqtinstall 3.1.22. See https://github.com/miurahr/aqtinstall/issues/843