diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 865abc15..59948267 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v1
       - name: Configure
-        run: .\vcsetup-2019.bat
+        run: .\vcsetup.bat
       - name: Build
         run: cmake --build build --config Release
 
diff --git a/vcsetup-2019.bat b/vcsetup-2019.bat
deleted file mode 100644
index 568a75fe..00000000
--- a/vcsetup-2019.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-rmdir /s /q build
-mkdir build
-
-cmake -G "Visual Studio 16 2019" -A x64 -DTINYUSDZ_WITH_OPENSUBDIV=On -Bbuild -H.
diff --git a/vcsetup.bat b/vcsetup.bat
new file mode 100644
index 00000000..e35dca1e
--- /dev/null
+++ b/vcsetup.bat
@@ -0,0 +1,6 @@
+rmdir /s /q build
+mkdir build
+
+rem cmake -G "Visual Studio 16 2019" -A x64 -DTINYUSDZ_WITH_OPENSUBDIV=On -Bbuild -H.
+
+cmake -G "Visual Studio 17 2022" -A x64 -DTINYUSDZ_WITH_OPENSUBDIV=On -Bbuild -H.