diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 4c6b79bad3de..97e13b3d98a6 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -479,7 +479,7 @@ workers:
             provisioner: '{trust-domain}-{level}'
             implementation: generic-worker
             os: windows
-            worker-type: '{alias}-azure'
+            worker-type: '{alias}'
         image:
             provisioner: '{trust-domain}-{level}'
             implementation: docker-worker
diff --git a/taskcluster/gecko_taskgraph/transforms/job/spidermonkey.py b/taskcluster/gecko_taskgraph/transforms/job/spidermonkey.py
index 91c7e93bd68b..c5cac4a2ffb5 100644
--- a/taskcluster/gecko_taskgraph/transforms/job/spidermonkey.py
+++ b/taskcluster/gecko_taskgraph/transforms/job/spidermonkey.py
@@ -102,7 +102,7 @@ def generic_worker_spidermonkey(config, job, taskdesc):
 
     run["using"] = "run-task"
     run["command"] = [
-        "c:\\mozilla-build\\msys2\\usr\\bin\\bash.exe "  # string concat
+        "c:\\mozilla-build\\msys\\bin\\bash.exe "  # string concat
         '"./src/taskcluster/scripts/builder/%s"' % script
     ]