diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index abe25b949..ca48599a0 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -18,7 +18,6 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
       - .github/workflows/cmake_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
@@ -26,9 +25,9 @@ on:
 jobs:
 
   msys2:
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
+    name: "${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
-    runs-on: windows-2022
+    runs-on: ${{ matrix.environment.runner }}
 
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -41,47 +40,38 @@ jobs:
       fail-fast: true
       matrix:
         build:
-#          - name: Regular
-#            preset: regular
-          - name: Debug
+          - name: Dev Debug
             preset: dev_debug
-            slug: -Debug
+            slug: -Dev-Debug
           - name: Dev
             preset: development
             slug: -Dev
         dynarec:
           - name: ODR
             new: off
-            slug: -ODR
           - name: NDR
             new: on
             slug: -NDR
-        ui:
-          - name: Qt GUI
-            qt: on
-            static: on
-            slug: -Qt
-            packages: >-
-              qt5-static:p
-              vulkan-headers:p
         environment:
-#          - msystem: MSYS
-#            toolchain: ./cmake/flags-gcc-x86_64.cmake
           - msystem: MINGW64
-            prefix: mingw-w64-x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
-#          - msystem: CLANG64
-#            prefix: mingw-w64-clang-x86_64
-#            toolchain: ./cmake/llvm-win32-x86_64.cmake
-#          - msystem: UCRT64
-#            prefix: mingw-w64-ucrt-x86_64
-#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: "-64"
+            runner: windows-2022
+          - msystem: CLANGARM64
+            toolchain: ./cmake/flags-gcc-aarch64.cmake
+            slug: -arm64
+            runner: windows-11-arm
+        exclude:
+          - dynarec:
+              new: off
+            environment:
+              msystem: CLANGARM64
 
     steps:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-
@@ -98,15 +88,17 @@ jobs:
             libslirp:p
             fluidsynth:p
             libserialport:p
-            ${{ matrix.ui.packages }}
+            qt5-static:p
+            vulkan-headers:p
+            openmp:p
 
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      # - name: Install sonar-scanner and build-wrapper
+      #   uses: SonarSource/sonarcloud-github-c-cpp@v3
 
       - name: Configure CMake
         run: >-
@@ -114,20 +106,20 @@ jobs:
           --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
-          -D QT=${{ matrix.ui.qt }}
-          -D STATIC_BUILD=${{ matrix.ui.static }}
+
+      # - name: Build
+      #   run: |
+      #     .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
 
       - name: Build
-        run: |
-          .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
+        run: cmake --build build
 
-      - name: Run sonar-scanner
-        if: 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          .sonar/sonar-scanner-5.0.1.3006-windows/bin/sonar-scanner.bat --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+      # - name: Run sonar-scanner
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      #   run: |
+      #     .sonar/sonar-scanner-5.0.1.3006-windows/bin/sonar-scanner.bat --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
 
       - name: Generate package
         run: cmake --install build
@@ -135,5 +127,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows${{ matrix.environment.slug }}-gha${{ github.run_number }}'
           path: build/artifacts/**