diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d0d3bbdd4e..78e111535b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -82,7 +82,7 @@ jobs:
 #  Threadsafe runs
           - name: "Windows TS MSVC"
             artifact: "Windows-MSVCTS.tar.xz"
-            os: windows-latest
+            os: windows-2016
             build_type: "Release"
             toolchain: ""
             cpp: OFF
@@ -91,7 +91,7 @@ jobs:
             ts: ON
             hl: OFF
             parallel: OFF
-            generator: "-G \"Visual Studio 16 2019\" -A x64"
+            generator: "-G \"Visual Studio 15 2017 Win64\""
           - name: "Ubuntu TS GCC"
             artifact: "LinuxTS.tar.xz"
             os: ubuntu-latest
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 8c3bb2c0bec..b50bf59933a 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -77,7 +77,7 @@ jobs:
 #  Threadsafe runs
           - name: "Windows TS MSVC"
             artifact: "Windows-MSVCTS.tar.xz"
-            os: windows-latest
+            os: windows-2016
             build_type: "Release"
             toolchain: ""
             cpp: OFF
@@ -86,7 +86,7 @@ jobs:
             ts: ON
             hl: OFF
             parallel: OFF
-            generator: "-G \"Visual Studio 16 2019\" -A x64"
+            generator: "-G \"Visual Studio 15 2017 Win64\""
           - name: "Ubuntu TS GCC"
             artifact: "LinuxTS.tar.xz"
             os: ubuntu-latest