diff --git a/.taskcluster.yml b/.taskcluster.yml
index 05bade9656..0cc9e363e6 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -38,8 +38,8 @@ tasks:
         description: |
             The task that creates all of the other tasks in the task graph
 
-      workerType: "hg-worker"
-      provisionerId: "aws-provisioner-v1"
+      workerType: "linux"
+      provisionerId: "nss-${repository.level}"
 
       scopes:
         - 'assume:repo:${repoUrl[8:]}:branch:default'
@@ -59,6 +59,7 @@ tasks:
           TC_SOURCE: "${repository.url}"
           TC_PROJECT: ${repository.project}
           TC_SCHEDULER_ID: "${schedulerId}"
+          MOZ_SCM_LEVEL: "${repository.level}"
           NSS_PUSHLOG_ID: '${push.pushlog_id}'
           NSS_HEAD_REPOSITORY: '${repository.url}'
           NSS_HEAD_REVISION: '${push.revision}'
diff --git a/automation/taskcluster/graph/src/extend.js b/automation/taskcluster/graph/src/extend.js
index 5b22ef8053..762198b2e7 100644
--- a/automation/taskcluster/graph/src/extend.js
+++ b/automation/taskcluster/graph/src/extend.js
@@ -829,7 +829,7 @@ async function scheduleFuzzing32() {
 
 async function scheduleWindows(name, base, build_script) {
   base = merge(base, {
-    workerType: "nss-win2012r2",
+    workerType: "win2012r2",
     env: {
       PATH: "c:\\mozilla-build\\bin;c:\\mozilla-build\\python;" +
 	    "c:\\mozilla-build\\msys\\local\\bin;c:\\mozilla-build\\7zip;" +
diff --git a/automation/taskcluster/graph/src/queue.js b/automation/taskcluster/graph/src/queue.js
index 874947af5b..5a9dc40231 100644
--- a/automation/taskcluster/graph/src/queue.js
+++ b/automation/taskcluster/graph/src/queue.js
@@ -156,8 +156,8 @@ function convertTask(def) {
   }, parameters);
 
   return {
-    provisionerId: def.provisioner || "aws-provisioner-v1",
-    workerType: def.workerType || "hg-worker",
+    provisionerId: def.provisioner || `nss-${process.env.MOZ_SCM_LEVEL}`,
+    workerType: def.workerType || "linux",
     schedulerId: process.env.TC_SCHEDULER_ID,
     taskGroupId: process.env.TASK_ID,