diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml
index 75a9ab544803..38d526c002be 100644
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -524,6 +524,9 @@ win64-vs2019:
         resources:
             - build/vs/vs2019.yaml
         toolchain-artifact: project/gecko/vs/vs.tar.zst
+        toolchain-alias:
+            - vs
+            - vs-toolchain
 
 win64-vs2022:
     description: "VS 2022"
@@ -541,9 +544,6 @@ win64-vs2022:
         resources:
             - build/vs/vs2022.yaml
         toolchain-artifact: project/gecko/vs/vs.tar.zst
-        toolchain-alias:
-            - vs
-            - vs-toolchain
 
 linux64-afl-instrumentation-4.0:
     description: "AFL++ instrumentation toolchain build"
diff --git a/taskcluster/ci/webrender/kind.yml b/taskcluster/ci/webrender/kind.yml
index 099fc2bc7dac..84a938cf6764 100644
--- a/taskcluster/ci/webrender/kind.yml
+++ b/taskcluster/ci/webrender/kind.yml
@@ -237,7 +237,7 @@ jobs:
             symbol: WR(wrench)
         when:
             files-changed:
-                - 'build/win64/mozconfig.vs2022'
+                - 'build/win64/mozconfig.vs2019'
                 - 'gfx/wr/**'
                 - 'taskcluster/scripts/misc/wrench-windows-tests.sh'
 
diff --git a/taskcluster/scripts/misc/build-llvm-common.sh b/taskcluster/scripts/misc/build-llvm-common.sh
index 73efc5093d25..2dbf68d3ec98 100755
--- a/taskcluster/scripts/misc/build-llvm-common.sh
+++ b/taskcluster/scripts/misc/build-llvm-common.sh
@@ -130,9 +130,9 @@ case "$target" in
     ln -s "windows kits/10" $MOZ_FETCHES_DIR/vs/sdk
     EXTRA_CMAKE_FLAGS="
       $EXTRA_CMAKE_FLAGS
-      -DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.39.33519
+      -DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.29.30133
       -DWINSDK_BASE=$MOZ_FETCHES_DIR/vs/sdk
-      -DWINSDK_VER=10.0.22621.0
+      -DWINSDK_VER=10.0.19041.0
     "
   fi
   ;;