diff --git a/.github/workflows/CMake-MSVC.yml b/.github/workflows/CMake-MSVC.yml
index dc5d4d3e..bf8f5731 100644
--- a/.github/workflows/CMake-MSVC.yml
+++ b/.github/workflows/CMake-MSVC.yml
@@ -13,16 +13,23 @@ jobs:
         # windows-2022: VS2022
         # windows-2019: VS2019
         os: [windows-2022, windows-2019]
-        arch: [Win32, x64, ARM, ARM64]
+        arch: [x86, x64, amd64_arm, amd64_arm64]
         shared: [ON, OFF]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+      - name: vcvars
+        uses: ilammy/msvc-dev-cmd@v1
+        if: ${{ matrix.arch }}
+        with:
+          arch: ${{ matrix.platform.msvc-arch }}
+      - name: install ninja
+        uses: turtlesec-no/get-ninja@main
       - name: fetch yasm
         run: python -c "from urllib.request import urlretrieve; urlretrieve('http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe', 'yasm.exe')"
       - name: add yasm to path
         run: echo "%GITHUB_WORKSPACE%" >> %GITHUB_PATH%
       - name: CMake
-        run: cd ports\cmake && cmake -A ${{ matrix.arch }} -DYASM_ASSEMBLER=%GITHUB_WORKSPACE%\yasm -DBUILD_SHARED_LIBS=${{ matrix.shared }} .
+        run: cmake -S ports/cmake -B build -DYASM_ASSEMBLER=%GITHUB_WORKSPACE%\yasm -DBUILD_SHARED_LIBS=${{ matrix.shared }}-GNinja
       - name: CMake --build
-        run: cd ports\cmake && cmake --build .
+        run: cmake --build build