diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9514bcdaf8f6..17d38532fca6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -191,20 +191,25 @@ jobs:
   Windows:
     if: github.repository == 'darktable-org/darktable' || github.event_name == 'workflow_dispatch'
     name: Windows_${{ matrix.msystem }}_${{ matrix.btype }}
-    runs-on: windows-latest
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: true
       matrix:
         btype:
           - Release
         msystem:
-          #- CLANG64
+          - CLANGARM64
           - UCRT64
         target:
           - skiptest
         generator:
           - Ninja
         eco: [-DDONT_USE_INTERNAL_LIBRAW=ON]
+        include:
+          - msystem: CLANGARM64
+            runner: windows-11-arm
+          - msystem: UCRT64
+            runner: windows-latest
     defaults:
       run:
         shell: msys2 {0}
@@ -229,7 +234,6 @@ jobs:
             cmake:p
             libxslt:p
             ninja:p
-            nsis:p
             python-jsonschema:p
             curl:p
             drmingw:p