diff --git a/browser/config/tooltool-manifests/win32/gn-build.manifest b/browser/config/tooltool-manifests/win32/gn-build.manifest
deleted file mode 100644
index 5ec9a8377adf..000000000000
--- a/browser/config/tooltool-manifests/win32/gn-build.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "version": "Visual Studio 2017 15.8.4 / SDK 10.0.17134.0",
-    "digest": "ecf1e03f6f98f86775059a43f9e7dc7e326f6643d7c08962d9f614e4f5a65b1ca63fa1cfeb0f1a3c2474bf0d4318dda960b378beb2a44ecf8a91111207f4ece5",
-    "size": 349626009,
-    "algorithm": "sha512",
-    "filename": "vs2017_15.8.4.zip",
-    "unpack": true
-  }
-]
diff --git a/browser/config/tooltool-manifests/win64/sccache-build.manifest b/browser/config/tooltool-manifests/win64/sccache-build.manifest
deleted file mode 100644
index 5ec9a8377adf..000000000000
--- a/browser/config/tooltool-manifests/win64/sccache-build.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "version": "Visual Studio 2017 15.8.4 / SDK 10.0.17134.0",
-    "digest": "ecf1e03f6f98f86775059a43f9e7dc7e326f6643d7c08962d9f614e4f5a65b1ca63fa1cfeb0f1a3c2474bf0d4318dda960b378beb2a44ecf8a91111207f4ece5",
-    "size": 349626009,
-    "algorithm": "sha512",
-    "filename": "vs2017_15.8.4.zip",
-    "unpack": true
-  }
-]
diff --git a/browser/config/tooltool-manifests/win32/build-clang-cl.manifest b/browser/config/tooltool-manifests/win64/vs2017.manifest
similarity index 100%
rename from browser/config/tooltool-manifests/win32/build-clang-cl.manifest
rename to browser/config/tooltool-manifests/win64/vs2017.manifest
diff --git a/taskcluster/ci/toolchain/cbindgen.yml b/taskcluster/ci/toolchain/cbindgen.yml
index 7e47bee58431..c1c6c3eadb4a 100644
--- a/taskcluster/ci/toolchain/cbindgen.yml
+++ b/taskcluster/ci/toolchain/cbindgen.yml
@@ -54,7 +54,7 @@ win64-cbindgen:
     worker-type: b-win2012
     worker:
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         arguments: ['x86_64-pc-windows-msvc']
         resources:
diff --git a/taskcluster/ci/toolchain/clang-tidy.yml b/taskcluster/ci/toolchain/clang-tidy.yml
index c964af947be6..44e3cc09241a 100644
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@@ -77,7 +77,7 @@ win64-clang-tidy:
     worker:
         max-run-time: 7200
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         script: build-clang.sh
         arguments:
diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml
index 05a5472f869f..81ac5eb7665e 100644
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -218,7 +218,7 @@ win64-clang-cl:
     worker-type: b-win2012
     worker:
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         script: build-clang.sh
         arguments:
diff --git a/taskcluster/ci/toolchain/gn.yml b/taskcluster/ci/toolchain/gn.yml
index 9f55136e6e82..53d499af9d88 100644
--- a/taskcluster/ci/toolchain/gn.yml
+++ b/taskcluster/ci/toolchain/gn.yml
@@ -50,7 +50,7 @@ win32-gn:
     worker:
         max-run-time: 3600
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/gn-build.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         script: build-gn-win32.sh
         resources:
diff --git a/taskcluster/ci/toolchain/grcov.yml b/taskcluster/ci/toolchain/grcov.yml
index 5f11450d28c0..69583b02b30c 100644
--- a/taskcluster/ci/toolchain/grcov.yml
+++ b/taskcluster/ci/toolchain/grcov.yml
@@ -37,7 +37,7 @@ win64-grcov:
     worker-type: b-win2012
     worker:
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         toolchain-artifact: public/build/grcov.tar.bz2
         resources:
diff --git a/taskcluster/ci/toolchain/rust-size.yml b/taskcluster/ci/toolchain/rust-size.yml
index 3663f91ab14a..8443b501af23 100644
--- a/taskcluster/ci/toolchain/rust-size.yml
+++ b/taskcluster/ci/toolchain/rust-size.yml
@@ -28,7 +28,7 @@ win64-rust-size:
     worker-type: b-win2012
     worker:
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         toolchain-artifact: public/build/rust-size.tar.bz2
         resources:
diff --git a/taskcluster/ci/toolchain/sccache.yml b/taskcluster/ci/toolchain/sccache.yml
index 2bd54a2d4c9f..807d793381f0 100644
--- a/taskcluster/ci/toolchain/sccache.yml
+++ b/taskcluster/ci/toolchain/sccache.yml
@@ -60,7 +60,7 @@ win64-sccache:
     worker:
         max-run-time: 3600
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2017.manifest"
     run:
         toolchain-artifact: public/build/sccache.tar.bz2
         resources: