diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
index 3c87a06..93ee99a 100644
--- a/.github/workflows/github-actions-build.yml
+++ b/.github/workflows/github-actions-build.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   PanelSwWixExtension-Build:
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v3.3.0
         with:
diff --git a/src/TidyBuild.custom.props b/src/TidyBuild.custom.props
index 898cfbc..740fbaa 100644
--- a/src/TidyBuild.custom.props
+++ b/src/TidyBuild.custom.props
@@ -14,7 +14,7 @@
 
     <!-- CMake -->
     <CMakeDir Condition="'$(CMakeDir)' == ''"></CMakeDir>
-    <CMakeVsVersion Condition="'$(CMakeVsVersion)'==''">Visual Studio 17 2022</CMakeVsVersion>
+    <CMakeVsVersion Condition="'$(CMakeVsVersion)'==''">Visual Studio 16 2021</CMakeVsVersion>
     <PlatformToolset Condition="'$(PlatformToolset)'==''">v142</PlatformToolset>
     <XPDeprecationWarning>false</XPDeprecationWarning>