diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 67401797..3dd28789 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -7,23 +7,32 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-          version: ["7.4", "8.0"]
-          arch: [x64]
-          ts: [ts]
-    runs-on: windows-2019
+        os: [windows-2019, windows-2022]
+        version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
+        arch: [x64]
+        ts: [ts]
+        exclude:
+          - {os: windows-2019, version: "8.4"}
+          - {os: windows-2019, version: "8.3"}
+          - {os: windows-2019, version: "8.2"}
+          - {os: windows-2019, version: "8.1"}
+          - {os: windows-2019, version: "8.0"}
+          - {os: windows-2022, version: "7.4"}
+    runs-on: ${{matrix.os}}
     steps:
       - name: Checkout imagick
         uses: actions/checkout@v2
       - name: Setup PHP
         id: setup-php
-        uses: cmb69/setup-php-sdk@v0.2
+        uses: php/setup-php-sdk@v0.10
         with:
           version: ${{matrix.version}}
           arch: ${{matrix.arch}}
           ts: ${{matrix.ts}}
+          cache: true
       - name: Download deps
         run: |
-          curl -LO https://windows.php.net/downloads/pecl/deps/ImageMagick-7.1.0-18-vc15-${{matrix.arch}}.zip
+          curl -LO https://downloads.php.net/~windows/pecl/deps/ImageMagick-7.1.0-18-vc15-${{matrix.arch}}.zip
           7z x ImageMagick-7.1.0-18-vc15-${{matrix.arch}}.zip -o..\deps
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1