diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
index c81e56a..43253c0 100644
--- a/.github/workflows/windows-msvc.yml
+++ b/.github/workflows/windows-msvc.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       matrix:
         arch: ["Win32", "x64"]
@@ -24,7 +24,7 @@ jobs:
       run: |
         mkdir out
         cd out
-        cmake -G "Visual Studio 16 2019" -A ${{ matrix.arch }} ../src/
+        cmake -G "Visual Studio 17 2022" -A ${{ matrix.arch }} ../src/
         cmake --build . --config Release
         cmake --install . --prefix artifacts
         cp ../COPYING.txt artifacts/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 38d045f..f0a3677 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       matrix:
         sys: ["MINGW32", "MINGW64"]
@@ -17,8 +17,10 @@ jobs:
       uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.sys }}
-        release: false
         pacboy: >-
+          gcc:p
+          cmake:p
+          ninja:p
           SDL2:p
           SDL2_ttf:p
 
@@ -31,5 +33,5 @@ jobs:
       run: |
         mkdir -p out/debug
         cd out/debug
-        cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../src/
-        make
+        cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Debug ../../src/
+        ninja