diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
index c72787539..ac250ef4c 100644
--- a/.github/workflows/ci-win.yml
+++ b/.github/workflows/ci-win.yml
@@ -9,9 +9,12 @@ jobs:
       matrix:
         node-version:  [10.x, 12.x, 14.x, 15.x, 16.x]
         os:
-          - windows-2019
-          - windows-2016
-    runs-on: ${{ matrix.os }}
+          - {toolchain: Visual Studio 16 2019, arch: Win32, server: 2019}
+          - {toolchain: Visual Studio 16 2019, arch: x64, server: 2019}
+          - {toolchain: Visual Studio 17 2022, arch: Win32, server: 2022}
+          - {toolchain: Visual Studio 17 2022, arch: x64, server: 2022}
+    runs-on: windows-${{ matrix.os.server }}
+    name: build-${{ matrix.os.toolchain}}-${{ matrix.os.arch}}
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}