Bug 1532783: [taskgraph] Switch to using worker aliases for docker-worker and generic-worker; r=dustin
authorTom Prince <mozilla@hocat.ca>
Tue, 30 Apr 2019 22:58:06 +0000
changeset 530845 cef374e9b2985d5ee4e79e9e3984e94a32d72dd1
parent 530844 10fbbb071d9c36433d5810640b005487d3c3d062
child 530846 49006e43876fad11314265a580e41a18f744388e
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1532783
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1532783: [taskgraph] Switch to using worker aliases for docker-worker and generic-worker; r=dustin Differential Revision: https://phabricator.services.mozilla.com/D24238
taskcluster/ci/addon/kind.yml
taskcluster/ci/artifact-build/kind.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/code-review/kind.yml
taskcluster/ci/cron-bouncer-check/kind.yml
taskcluster/ci/geckodriver-repack/kind.yml
taskcluster/ci/generate-profile/kind.yml
taskcluster/ci/hazard/kind.yml
taskcluster/ci/instrumented-build/kind.yml
taskcluster/ci/l10n/kind.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/ci/openh264-plugin/kind.yml
taskcluster/ci/packages/kind.yml
taskcluster/ci/pipfile-update/kind.yml
taskcluster/ci/post-balrog-dummy/kind.yml
taskcluster/ci/post-beetmover-checksums-dummy/kind.yml
taskcluster/ci/post-beetmover-dummy/kind.yml
taskcluster/ci/post-langpack-dummy/kind.yml
taskcluster/ci/release-bouncer-check/kind.yml
taskcluster/ci/release-eme-free-repack/kind.yml
taskcluster/ci/release-final-verify/kind.yml
taskcluster/ci/release-generate-checksums/kind.yml
taskcluster/ci/release-notify-promote/kind.yml
taskcluster/ci/release-notify-push/kind.yml
taskcluster/ci/release-notify-ship/kind.yml
taskcluster/ci/release-notify-started/kind.yml
taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml
taskcluster/ci/release-partner-repack/kind.yml
taskcluster/ci/release-secondary-final-verify/kind.yml
taskcluster/ci/release-secondary-notify-ship/kind.yml
taskcluster/ci/release-secondary-update-verify-config/kind.yml
taskcluster/ci/release-secondary-update-verify/kind.yml
taskcluster/ci/release-snap-repackage/kind.yml
taskcluster/ci/release-source/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/release-update-verify/kind.yml
taskcluster/ci/repo-update/kind.yml
taskcluster/ci/searchfox/kind.yml
taskcluster/ci/source-test/clang.yml
taskcluster/ci/source-test/coverity.yml
taskcluster/ci/source-test/cram.yml
taskcluster/ci/source-test/doc.yml
taskcluster/ci/source-test/file-metadata.yml
taskcluster/ci/source-test/infer.yml
taskcluster/ci/source-test/jsshell.yml
taskcluster/ci/source-test/mozlint.yml
taskcluster/ci/source-test/node.yml
taskcluster/ci/source-test/python.yml
taskcluster/ci/source-test/webidl.yml
taskcluster/ci/source-test/wpt-manifest.yml
taskcluster/ci/source-test/wpt-metadata.yml
taskcluster/ci/spidermonkey/kind.yml
taskcluster/ci/spidermonkey/windows.yml
taskcluster/ci/static-analysis-autotest/kind.yml
taskcluster/ci/toolchain/android.yml
taskcluster/ci/toolchain/cbindgen.yml
taskcluster/ci/toolchain/cctools-port.yml
taskcluster/ci/toolchain/clang-tidy.yml
taskcluster/ci/toolchain/clang.yml
taskcluster/ci/toolchain/gcc.yml
taskcluster/ci/toolchain/gn.yml
taskcluster/ci/toolchain/grcov.yml
taskcluster/ci/toolchain/mingw.yml
taskcluster/ci/toolchain/minidump_stackwalk.yml
taskcluster/ci/toolchain/misc.yml
taskcluster/ci/toolchain/nasm.yml
taskcluster/ci/toolchain/node.yml
taskcluster/ci/toolchain/rust-size.yml
taskcluster/ci/toolchain/rust.yml
taskcluster/ci/toolchain/sccache.yml
taskcluster/ci/upload-generated-sources/kind.yml
taskcluster/ci/upload-symbols/kind.yml
taskcluster/ci/valgrind/kind.yml
taskcluster/ci/webrender/kind.yml
taskcluster/taskgraph/transforms/diffoscope.py
taskcluster/taskgraph/transforms/docker_image.py
taskcluster/taskgraph/transforms/fetch.py
taskcluster/taskgraph/transforms/job/mozharness.py
taskcluster/taskgraph/transforms/job/mozharness_test.py
taskcluster/taskgraph/transforms/l10n.py
taskcluster/taskgraph/transforms/partials.py
taskcluster/taskgraph/transforms/repackage.py
taskcluster/taskgraph/transforms/repackage_partner.py
taskcluster/taskgraph/transforms/tests.py
--- a/taskcluster/ci/addon/kind.yml
+++ b/taskcluster/ci/addon/kind.yml
@@ -15,17 +15,17 @@ jobs:
             product: firefox
             job-name: addons.tps
         treeherder:
             platform: linux64/opt
             symbol: TPS(addon)
             kind: build
             tier: 1
         run-on-projects: [mozilla-central]
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: debian7-amd64-build}
             max-run-time: 1800
             artifacts:
                 - type: file
                   name: public/tps.xpi
                   path: /builds/worker/checkouts/gecko/tps-out/tps.xpi
         run:
--- a/taskcluster/ci/artifact-build/kind.yml
+++ b/taskcluster/ci/artifact-build/kind.yml
@@ -21,17 +21,17 @@ jobs:
             product: firefox
             job-name: linux64-artifact-opt
         treeherder:
             platform: linux64/opt
             kind: build
             symbol: AB
             tier: 2
         run-on-projects: ['trunk', 'try']
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 3600
             env:
                 PERFHERDER_EXTRA_OPTIONS: artifact
                 MOZ_ARTIFACT_TASK: {task-reference: '<linux64-opt>'}
                 USE_ARTIFACT: '1'
         run:
             using: mozharness
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -3,17 +3,17 @@ linux64/opt:
     index:
         product: firefox
         job-name: linux64-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: linux64/opt
         symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -36,17 +36,17 @@ linux64-plain/opt:
     description: "Linux64 Opt Plain"
     index:
         product: firefox
         job-name: linux64-plain-opt
     treeherder:
         platform: linux64/opt
         symbol: Bp
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian9-amd64-build}
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: plain
     run:
         using: mozharness
         actions: [build]
@@ -70,17 +70,17 @@ linux64-plain/opt:
 linux64-fuzzing/debug:
     description: "Linux64 Fuzzing Debug"
     index:
         product: firefox
         job-name: linux64-fuzzing-debug
     treeherder:
         platform: linux64/debug
         symbol: Bf
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: fuzzing
             FORCE_GCC: '1'
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
@@ -108,17 +108,17 @@ linux64/debug:
     index:
         product: firefox
         job-name: linux64-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: linux64/debug
         symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -142,17 +142,17 @@ linux64-plain/debug:
     description: "Linux64 Debug Plain"
     index:
         product: firefox
         job-name: linux64-plain-debug
     treeherder:
         platform: linux64/debug
         symbol: Bp
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian9-amd64-build}
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: plain
     run:
         using: mozharness
         actions: [build]
@@ -183,17 +183,17 @@ linux64-devedition-nightly/opt:
     shipping-product: devedition
     index:
         product: devedition
         job-name: linux64-opt
         type: nightly
     treeherder:
         platform: linux64-devedition/opt
         symbol: N
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -218,17 +218,17 @@ linux64-devedition-nightly/opt:
 linux64-base-toolchains/opt:
     description: "Linux64 base toolchains Opt"
     index:
         product: firefox
         job-name: linux64-base-toolchains-opt
     treeherder:
         platform: linux64/opt
         symbol: Bb
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-amd64-build-base}
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains
             FORCE_GCC: '1'
     run:
         using: mozharness
@@ -252,17 +252,17 @@ linux64-base-toolchains/opt:
 linux64-base-toolchains/debug:
     description: "Linux64 base toolchains Debug"
     index:
         product: firefox
         job-name: linux64-base-toolchains-debug
     treeherder:
         platform: linux64/debug
         symbol: Bb
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-amd64-build-base}
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains
             FORCE_GCC: '1'
     run:
         using: mozharness
@@ -288,17 +288,17 @@ linux64-base-toolchains/debug:
 linux64-base-toolchains-clang/opt:
     description: "Linux64 base toolchains clang Opt"
     index:
         product: firefox
         job-name: linux64-base-toolchains-clang-opt
     treeherder:
         platform: linux64/opt
         symbol: Bbc
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-amd64-build-base}
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains-clang
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
@@ -320,17 +320,17 @@ linux64-base-toolchains-clang/opt:
 linux64-base-toolchains-clang/debug:
     description: "Linux64 base toolchains clang Debug"
     index:
         product: firefox
         job-name: linux64-base-toolchains-clang-debug
     treeherder:
         platform: linux64/debug
         symbol: Bbc
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-amd64-build-base}
         max-run-time: 3600
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains-clang
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
@@ -356,17 +356,17 @@ linux/opt:
     index:
         product: firefox
         job-name: linux-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: linux32/opt
         symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-i386-build}
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
@@ -391,17 +391,17 @@ linux/debug:
     index:
         product: firefox
         job-name: linux-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: linux32/debug
         symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-i386-build}
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
@@ -426,17 +426,17 @@ linux-rusttests/opt:
     description: "Linux32 Rust Tests Opt"
     index:
         product: firefox
         job-name: linux-rusttests-opt
     treeherder:
         platform: linux32/opt
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-i386-build}
         max-run-time: 2700
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
         actions: [get-secrets, build]
@@ -464,17 +464,17 @@ linux-rusttests/debug:
     description: "Linux32 Rust Tests Debug"
     index:
         product: firefox
         job-name: linux-rusttests-debug
     treeherder:
         platform: linux32/debug
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-i386-build}
         max-run-time: 2700
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
         actions: [get-secrets, build]
@@ -507,17 +507,17 @@ linux-devedition-nightly/opt:
     shipping-product: devedition
     index:
         product: devedition
         job-name: linux-opt
         type: nightly
     treeherder:
         platform: linux32-devedition/opt
         symbol: N
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-i386-build}
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
@@ -549,17 +549,17 @@ linux-shippable/opt:
     shipping-product: firefox
     index:
         product: firefox
         job-name: linux-opt
         type: shippable
     treeherder:
         platform: linux32-shippable/opt
         symbol: B
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian7-i386-build}
         max-run-time: 9000
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
@@ -581,17 +581,17 @@ linux-shippable/opt:
 linux64-asan/opt:
     description: "Linux64 Opt ASAN"
     index:
         product: firefox
         job-name: linux64-asan-opt
     treeherder:
         platform: linux64/asan
         symbol: Bo
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: "opt asan"
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
@@ -616,17 +616,17 @@ linux64-asan/opt:
 linux64-asan-fuzzing/opt:
     description: "Linux64 Fuzzing Opt ASAN"
     index:
         product: firefox
         job-name: linux64-fuzzing-asan-opt
     treeherder:
         platform: linux64/asan
         symbol: Bof
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
@@ -652,17 +652,17 @@ linux64-asan-fuzzing-ccov/opt:
     description: "Linux64 Fuzzing Opt ASAN w/ Coverage"
     index:
         product: firefox
         job-name: linux64-ccov-fuzzing-asan-opt
     treeherder:
         platform: linux64/asan
         symbol: Bocf
     run-on-projects: ['mozilla-central', 'try']
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-fuzzing-ccov
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
@@ -687,17 +687,17 @@ linux64-fuzzing-ccov/opt:
     description: "Linux64 Fuzzing Opt w/ Coverage"
     index:
         product: firefox
         job-name: linux64-ccov-fuzzing-opt
     treeherder:
         platform: linux64/opt
         symbol: Bocf
     run-on-projects: ['mozilla-central', 'try']
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: fuzzing-ccov
             FORCE_GCC: '1'
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
@@ -730,17 +730,17 @@ linux64-asan-reporter-nightly/opt:
     index:
         product: firefox
         job-name: linux64-asan-reporter-opt
         type: nightly
     treeherder:
         platform: linux64-asan-reporter/opt
         symbol: BoR
     run-on-projects: ['mozilla-central']
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-reporter
         max-run-time: 3600
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
@@ -765,17 +765,17 @@ linux64-asan-reporter-nightly/opt:
 linux64-asan/debug:
     description: "Linux64 Debug ASAN"
     index:
         product: firefox
         job-name: linux64-asan-debug
     treeherder:
         platform: linux64/asan
         symbol: Bd
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: "debug asan"
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
@@ -807,17 +807,17 @@ linux64-shippable/opt:
     shipping-product: firefox
     index:
         product: firefox
         job-name: linux64-opt
         type: shippable
     treeherder:
         platform: linux64-shippable/opt
         symbol: Bpgo(B)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 9000
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -840,17 +840,17 @@ linux64-noopt/debug:
     description: "Linux64 No-optimize Debug"
     index:
         product: firefox
         job-name: linux64-noopt-debug
     treeherder:
         platform: linux64-noopt/debug
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 5400
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -876,17 +876,17 @@ linux64-rusttests/opt:
     description: "Linux64 Rust Tests Opt"
     index:
         product: firefox
         job-name: linux64-rusttests-opt
     treeherder:
         platform: linux64/opt
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 2700
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -913,17 +913,17 @@ linux64-rusttests/debug:
     description: "Linux64 Rust Tests Debug"
     index:
         product: firefox
         job-name: linux64-rusttests-debug
     treeherder:
         platform: linux64/debug
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 2700
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -950,17 +950,17 @@ linux64-tup/opt:
     description: "Linux64 Tup"
     index:
         product: firefox
         job-name: linux64-tup-opt
     treeherder:
         platform: linux64/opt
         symbol: Btup
         tier: 3
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             PERFHERDER_EXTRA_OPTIONS: tup
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -988,17 +988,17 @@ linux64-ccov/debug:
     index:
         product: firefox
         job-name: linux64-ccov-debug
     treeherder:
         platform: linux64-ccov/debug
         symbol: B
         tier: 2
     run-on-projects: ['mozilla-central', 'try']
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         artifacts:
             - name: public/code-coverage-grcov.zip
               path: /builds/worker/workspace/build/src/obj-firefox/code-coverage-grcov.zip
               type: file
         max-run-time: 7200
         env:
             FORCE_GCC: '1'
@@ -1031,17 +1031,17 @@ linux64-ccov/opt:
     index:
         product: firefox
         job-name: linux64-ccov-opt
     treeherder:
         platform: linux64-ccov/opt
         symbol: B
         tier: 2
     run-on-projects: ['mozilla-central', 'try']
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
             FORCE_GCC: '1'
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
@@ -1066,17 +1066,17 @@ linux64-add-on-devel/opt:
     description: "Linux64 add-on-devel"
     index:
         product: firefox
         job-name: linux64-add-on-devel
     treeherder:
         platform: linux64-add-on-devel/opt
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
     run:
         using: mozharness
         actions: [get-secrets, build, check-test]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -1103,17 +1103,17 @@ linux64-aarch64/opt:
         product: firefox
         job-name: linux64-aarch64-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: linux64-aarch64/opt
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: debian9-arm64-build}
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
             - builds/releng_base_firefox.py
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -4,17 +4,17 @@ macosx64/debug:
         product: firefox
         job-name: macosx64-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: osx-cross/debug
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -45,17 +45,17 @@ macosx64/opt:
         product: firefox
         job-name: macosx64-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: osx-cross/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -82,17 +82,17 @@ macosx64/opt:
 macosx64-asan-fuzzing/opt:
     description: "MacOS X x64 Cross-compile Fuzzing ASAN"
     index:
         product: firefox
         job-name: macosx64-fuzzing-asan-opt
     treeherder:
         platform: osx-cross/asan
         symbol: Bof
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
@@ -123,17 +123,17 @@ macosx64-fuzzing/debug:
     index:
         product: firefox
         job-name: macosx64-fuzzing-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: osx-cross/debug
         symbol: Bf
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: fuzzing
     run:
         using: mozharness
         actions: [get-secrets, build]
@@ -169,17 +169,17 @@ macosx64-devedition-nightly/opt:
     index:
         product: devedition
         job-name: macosx64-opt
         type: nightly
     treeherder:
         platform: osx-cross-devedition/opt
         symbol: N
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -210,17 +210,17 @@ macosx64-noopt/debug:
     description: "MacOS X x64 No-optimize Debug"
     index:
         product: firefox
         job-name: macosx64-noopt-debug
     treeherder:
         platform: osx-cross-noopt/debug
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -251,17 +251,17 @@ macosx64-add-on-devel/opt:
     description: "MacOS X x64 add-on-devel"
     index:
         product: firefox
         job-name: macosx64-add-on-devel
     treeherder:
         platform: osx-cross-add-on-devel/opt
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -297,17 +297,17 @@ macosx64-shippable/opt:
     index:
         product: firefox
         job-name: macosx64-opt
         type: shippable
     treeherder:
         platform: osx-shippable/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
@@ -334,17 +334,17 @@ macosx64-ccov/debug:
     description: "MacOS X x64 Cross-compile Code Coverage"
     index:
         product: firefox
         job-name: macosx64-ccov-debug
     treeherder:
         platform: osx-cross-ccov/debug
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
         actions: [get-secrets, build]
         config:
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -9,17 +9,17 @@ win32/debug:
         product: firefox
         job-name: win32-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-32/debug
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -44,17 +44,17 @@ win32/opt:
         product: firefox
         job-name: win32-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-32/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -80,17 +80,17 @@ win64/debug:
         product: firefox
         job-name: win64-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-64/debug
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -115,17 +115,17 @@ win64-fuzzing/debug:
         product: firefox
         job-name: win64-fuzzing-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-64/debug
         symbol: Bf
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: fuzzing
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
@@ -150,17 +150,17 @@ win64-plain/debug:
     description: "Win64 Debug Plain"
     index:
         product: firefox
         job-name: win64-plain-debug
     treeherder:
         platform: windows2012-64/debug
         symbol: Bp
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: plain
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         actions: [build, check-test]
         options: [append-env-variables-from-configs]
@@ -187,17 +187,17 @@ win64/opt:
         product: firefox
         job-name: win64-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-64/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -221,17 +221,17 @@ win64-plain/opt:
     description: "Win64 Opt Plain"
     index:
         product: firefox
         job-name: win64-plain-opt
     treeherder:
         platform: windows2012-64/opt
         symbol: Bp
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: plain
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         actions: [build]
         options: [append-env-variables-from-configs]
@@ -272,17 +272,17 @@ win32-shippable/opt:
                     try: true
                     default: false
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-32-shippable/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -311,17 +311,17 @@ win64-shippable/opt:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-64-shippable/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -344,17 +344,17 @@ win32-add-on-devel/opt:
     description: "Windows32 add-on-devel"
     index:
         product: firefox
         job-name: win32-add-on-devel
     treeherder:
         platform: windows2012-32-add-on-devel/opt
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
@@ -379,17 +379,17 @@ win64-add-on-devel/opt:
     description: "Windows64 add-on-devel"
     index:
         product: firefox
         job-name: win64-add-on-devel
     treeherder:
         platform: windows2012-64-add-on-devel/opt
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
@@ -414,17 +414,17 @@ win64-noopt/debug:
     description: "Win64 No-optimize Debug"
     index:
         product: firefox
         job-name: win64-noopt-debug
     treeherder:
         platform: windows2012-64-noopt/debug
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -448,17 +448,17 @@ win32-noopt/debug:
     description: "Win32 No-optimize Debug"
     index:
         product: firefox
         job-name: win32-noopt-debug
     treeherder:
         platform: windows2012-32-noopt/debug
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -482,17 +482,17 @@ win32-rusttests/opt:
     description: "Win32 Rust Tests Opt"
     index:
         product: firefox
         job-name: win32-rusttests-opt
     treeherder:
         platform: windows2012-32/opt
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -520,17 +520,17 @@ win32-rusttests/debug:
     description: "Win32 Rust Tests Debug"
     index:
         product: firefox
         job-name: win32-rusttests-debug
     treeherder:
         platform: windows2012-32/debug
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -558,17 +558,17 @@ win64-rusttests/opt:
     description: "Win64 Rust Tests Opt"
     index:
         product: firefox
         job-name: win64-rusttests-opt
     treeherder:
         platform: windows2012-64/opt
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -593,17 +593,17 @@ win64-rusttests/debug:
     description: "Win64 Rust Tests Debug"
     index:
         product: firefox
         job-name: win64-rusttests-debug
     treeherder:
         platform: windows2012-64/debug
         symbol: BR
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -628,17 +628,17 @@ win64-ccov/debug:
     description: "Win64 Debug Code Coverage"
     index:
         product: firefox
         job-name: win64-ccov-debug
     treeherder:
         platform: windows2012-64/ccov
         symbol: B
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         artifacts:
             - name: public/code-coverage-grcov.zip
               path: build\src\obj-firefox\code-coverage-grcov.zip
               type: file
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
@@ -669,17 +669,17 @@ win64-asan/debug:
     description: "Win64 Debug ASAN"
     index:
         product: firefox
         job-name: win64-asan-debug
     treeherder:
         platform: windows2012-64/asan
         symbol: Bd
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "debug asan"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
@@ -704,17 +704,17 @@ win64-asan/opt:
     description: "Win64 Opt ASAN"
     index:
         product: firefox
         job-name: win64-asan-opt
     treeherder:
         platform: windows2012-64/asan
         symbol: Bo
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "opt asan"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
@@ -746,17 +746,17 @@ win64-asan-reporter-nightly/opt:
             default: null
     index:
         product: firefox
         job-name: win64-asan-reporter-opt
         type: nightly
     treeherder:
         platform: win64-asan-reporter/opt
         symbol: BoR
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "asan-reporter"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
@@ -782,17 +782,17 @@ win64-asan-reporter-nightly/opt:
 win64-asan-fuzzing/opt:
     description: "Win64 Fuzzing Opt ASAN"
     index:
         product: firefox
         job-name: win64-fuzzing-asan-opt
     treeherder:
         platform: windows2012-64/asan
         symbol: Bof
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: fuzzing-asan
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
@@ -834,17 +834,17 @@ win32-devedition-nightly/opt:
                     try: true
                     default: false
     shipping-phase: build
     shipping-product: devedition
     treeherder:
         platform: windows2012-32-devedition/opt
         symbol: N
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         options: [enable-pgo, append-env-variables-from-configs]
@@ -875,17 +875,17 @@ win64-devedition-nightly/opt:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: devedition
     treeherder:
         platform: windows2012-64-devedition/opt
         symbol: N
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
@@ -912,17 +912,17 @@ win64-aarch64/debug:
         product: firefox
         job-name: win64-aarch64-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-aarch64/debug
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -950,17 +950,17 @@ win64-aarch64/opt:
         product: firefox
         job-name: win64-aarch64-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-aarch64/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -986,17 +986,17 @@ win64-aarch64-eme/opt:
     description: "AArch64 Win64 Opt w/ EME"
     index:
         product: firefox
         job-name: win64-aarch64-eme-opt
     treeherder:
         platform: windows2012-aarch64/opt
         symbol: Be
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64-eme
             MOZ_ARTIFACT_TASK: {task-reference: '<win64-aarch64-opt>'}
             MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: '<win32-opt>'}
             USE_ARTIFACT: '1'
@@ -1028,17 +1028,17 @@ win64-aarch64-shippable/opt:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-aarch64-shippable/opt
         symbol: B
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64
             MOZ_ARTIFACT_TASK: {task-reference: '<win64-aarch64-opt>'}
             MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: '<win32-opt>'}
             USE_ARTIFACT: '1'
@@ -1081,17 +1081,17 @@ win64-aarch64-shippable-no-eme/opt:
     attributes:
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-aarch64/opt
         symbol: Nn
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -1124,17 +1124,17 @@ win64-aarch64-devedition-nightly/opt:
         nightly: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: devedition
     treeherder:
         platform: windows2012-aarch64-devedition/opt
         symbol: N
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64-devedition
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
--- a/taskcluster/ci/code-review/kind.yml
+++ b/taskcluster/ci/code-review/kind.yml
@@ -11,17 +11,17 @@ transforms:
 
 kind-dependencies:
    - source-test
 
 jobs:
    issues:
       label: code-review-issues
       description: List all issues found in static analysis and linting tasks
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
 
       # Only run by using the code-review target_tasks_method
       run-on-projects: []
 
       # This option permits to run the task
       # regardless of the soft-dependencies tasks exit status
       # as we are interested in the task failures
       requires: all-resolved
--- a/taskcluster/ci/cron-bouncer-check/kind.yml
+++ b/taskcluster/ci/cron-bouncer-check/kind.yml
@@ -7,17 +7,17 @@ loader: taskgraph.loader.transform:loade
 transforms:
     - taskgraph.transforms.bouncer_check:transforms
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     name: bouncer-check
     description: bouncer check
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1200
         docker-image: {in-tree: "update-verify"}
     run:
         sparse-profile: mozharness
         extra-config:
             bouncer_prefix: "https://download.mozilla.org/"
     attributes:
--- a/taskcluster/ci/geckodriver-repack/kind.yml
+++ b/taskcluster/ci/geckodriver-repack/kind.yml
@@ -16,17 +16,17 @@ transforms:
 job-defaults:
     attributes:
         nightly: true
     description: "Extract geckodriver binary from common tests package"
     treeherder:
         kind: other
         symbol: Gd(repack)
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1200
         docker-image: {in-tree: debian9-amd64-build}
         chain-of-trust: true
     run:
         using: run-task
 
 jobs:
--- a/taskcluster/ci/generate-profile/kind.yml
+++ b/taskcluster/ci/generate-profile/kind.yml
@@ -26,17 +26,17 @@ jobs:
         description: "Linux64 Profile Generation"
         shipping-phase: build
         shipping-product: firefox
         index:
             product: firefox
             job-name: linux64-profile
         treeherder:
             platform: linux64-shippable/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 1200
             docker-image: {in-tree: debian9-amd64-build}
             artifacts:
                 - type: file
                   name: public/build/profdata.tar.xz
                   path: /builds/worker/artifacts/profdata.tar.xz
                 - type: file
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -15,17 +15,17 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     attributes:
         retrigger: true
     treeherder:
         kind: build
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 36000
         docker-image: {in-tree: debian7-amd64-build}
 
 jobs:
     linux64-shell-haz/debug:
         description: "JS Shell Hazard Analysis Linux"
         index:
--- a/taskcluster/ci/instrumented-build/kind.yml
+++ b/taskcluster/ci/instrumented-build/kind.yml
@@ -23,17 +23,17 @@ job-defaults:
 
 jobs:
     linux64-shippable/opt:
         description: "Linux64 Instrumented"
         shipping-phase: build
         shipping-product: firefox
         treeherder:
             platform: linux64-shippable/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 7200
             env:
                 PERFHERDER_EXTRA_OPTIONS: instrumented
         run:
             using: mozharness
             actions: [get-secrets, build]
             config:
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -77,18 +77,18 @@ job-template:
                 linux64.*: linux64-opt
                 macosx64.*: macosx64-opt
                 win32.*: win32-opt
                 win64.*: win64-opt
                 android-api-16: android-api-16-opt
     run-on-projects: ['all']
     worker-type:
         by-build-platform:
-            default: aws-provisioner-v1/gecko-{level}-b-linux
-            win.*: aws-provisioner-v1/gecko-{level}-b-win2012
+            default: b-linux
+            win.*: b-win2012
     treeherder:
         symbol: L10n
         tier:
             by-build-platform:
                 default: 1
                 android-api-16: 2
         platform:
             by-build-platform:
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -110,18 +110,18 @@ job-template:
                 linux64-devedition-nightly: linux64-devedition-opt
                 macosx64-devedition-nightly: macosx64-devedition-opt
                 win32-devedition-nightly: win32-devedition-opt
                 win64-devedition-nightly: win64-devedition-opt
                 win64-aarch64-devedition-nightly: win64-aarch64-devedition-opt
                 android-api-16-nightly: android-api-16-opt
     worker-type:
         by-build-platform:
-            default: aws-provisioner-v1/gecko-{level}-b-linux
-            win.*: aws-provisioner-v1/gecko-{level}-b-win2012
+            default: b-linux
+            win.*: b-win2012
     treeherder:
         symbol: L10n(N)
         tier:
             by-build-platform:
                 default: 1
                 android-api-16-nightly: 2
         platform:
             by-build-platform:
--- a/taskcluster/ci/openh264-plugin/kind.yml
+++ b/taskcluster/ci/openh264-plugin/kind.yml
@@ -27,17 +27,17 @@ job-defaults:
 
 jobs:
     linux32/opt:
         attributes:
             build_platform: linux32
             build_type: opt
         treeherder:
             platform: linux32/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 1800
             artifacts:
                 - name: private/openh264
                   path: /builds/worker/workspace/build/openh264/artifacts
                   type: directory
         run:
             using: mozharness
@@ -48,17 +48,17 @@ jobs:
         toolchains:
             - linux64-clang
     linux64/opt:
         attributes:
             build_platform: linux64
             build_type: opt
         treeherder:
             platform: linux64/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 1800
             artifacts:
                 - name: private/openh264
                   path: /builds/worker/workspace/build/openh264/artifacts
                   type: directory
         run:
             using: mozharness
@@ -69,17 +69,17 @@ jobs:
         toolchains:
             - linux64-clang
     macosx64/opt:
         attributes:
             build_platform: macosx64
             build_type: opt
         treeherder:
             platform: macosx64/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 1800
             artifacts:
                 - name: private/openh264
                   path: /builds/worker/workspace/build/openh264/artifacts
                   type: directory
         run:
             using: mozharness
@@ -91,17 +91,17 @@ jobs:
             - linux64-cctools-port
             - linux64-clang
     win32/opt:
         attributes:
             build_platform: win32
             build_type: opt
         treeherder:
             platform: win32/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+        worker-type: b-win2012
         worker:
             max-run-time: 1800
             artifacts:
                 - name: private/openh264
                   path: build/openh264/artifacts
                   type: directory
         run:
             using: mozharness
@@ -111,17 +111,17 @@ jobs:
         toolchains:
             - win64-clang-cl
     win64/opt:
         attributes:
             build_platform: win64
             build_type: opt
         treeherder:
             platform: win64/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+        worker-type: b-win2012
         worker:
             max-run-time: 1800
             artifacts:
                 - name: private/openh264
                   path: build/openh264/artifacts
                   type: directory
         run:
             using: mozharness
@@ -131,17 +131,17 @@ jobs:
         toolchains:
             - win64-clang-cl
     win64-aarch64/opt:
         attributes:
             build_platform: win64-aarch64
             build_type: opt
         treeherder:
             platform: win64-aarch64/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+        worker-type: b-win2012
         worker:
             max-run-time: 1800
             artifacts:
                 - name: private/openh264
                   path: build/openh264/artifacts
                   type: directory
         run:
             using: mozharness
--- a/taskcluster/ci/packages/kind.yml
+++ b/taskcluster/ci/packages/kind.yml
@@ -10,17 +10,17 @@ transforms:
   - taskgraph.transforms.cached_tasks:transforms
   - taskgraph.transforms.task:transforms
 
 job-defaults:
   treeherder:
     kind: build
     platform: packages/opt
     tier: 1
-  worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+  worker-type: b-linux
   worker:
     max-run-time: 1800
   run-on-projects: []
   run:
     dist: wheezy
     snapshot: 20171210T214726Z
 
 jobs:
--- a/taskcluster/ci/pipfile-update/kind.yml
+++ b/taskcluster/ci/pipfile-update/kind.yml
@@ -12,17 +12,17 @@ transforms:
 job-defaults:
    name: pipfile_update
    description: Update Pipfile.lock
    run-on-projects: []
    treeherder:
       kind: build
       platform: linux64/opt
       tier: 1
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: {in-tree: pipfile-updates}
       taskcluster-proxy: true
       max-run-time: 2400
       command:
          - /runme.sh
--- a/taskcluster/ci/post-balrog-dummy/kind.yml
+++ b/taskcluster/ci/post-balrog-dummy/kind.yml
@@ -11,17 +11,17 @@ transforms:
 
 kind-dependencies:
    - balrog
 
 job-template:
    description: Dummy task to deal with max_dependencies
    run-on-projects: []
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/post-beetmover-checksums-dummy/kind.yml
+++ b/taskcluster/ci/post-beetmover-checksums-dummy/kind.yml
@@ -16,49 +16,49 @@ kind-dependencies:
 
 jobs:
    firefox-promote:
       name: post-beetmover-checksums-dummy
       description: Dummy task to deal with max_dependencies
       run-on-projects: []
       shipping-phase: promote
       shipping-product: firefox
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
       worker:
          implementation: docker-worker
          os: linux
          docker-image: "ubuntu:16.10"
          max-run-time: 600
          command:
             - /bin/bash
             - -c
             - echo "Dummy task"
    devedition-promote:
       name: post-beetmover-checksums-dummy
       description: Dummy task to deal with max_dependencies
       run-on-projects: []
       shipping-phase: promote
       shipping-product: devedition
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
       worker:
          implementation: docker-worker
          os: linux
          docker-image: "ubuntu:16.10"
          max-run-time: 600
          command:
             - /bin/bash
             - -c
             - echo "Dummy task"
    fennec-promote:
       name: post-beetmover-checksums-dummy
       description: Dummy task to deal with max_dependencies
       run-on-projects: []
       shipping-phase: promote
       shipping-product: fennec
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
       worker:
          implementation: docker-worker
          os: linux
          docker-image: "ubuntu:16.10"
          max-run-time: 600
          command:
             - /bin/bash
             - -c
--- a/taskcluster/ci/post-beetmover-dummy/kind.yml
+++ b/taskcluster/ci/post-beetmover-dummy/kind.yml
@@ -15,17 +15,17 @@ kind-dependencies:
    # Fennec doesn't have beetmover-{checksums,repackage}, so
    # also depend on vanilla beetmover.
    - beetmover
 
 job-template:
    description: Dummy task to deal with max_dependencies
    run-on-projects: []
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/post-langpack-dummy/kind.yml
+++ b/taskcluster/ci/post-langpack-dummy/kind.yml
@@ -13,34 +13,34 @@ kind-dependencies:
 
 jobs:
    firefox-promote:
       name: post-langpack-dummy
       description: Dummy task to deal with max_dependencies
       run-on-projects: []
       shipping-phase: promote
       shipping-product: firefox
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
       worker:
          implementation: docker-worker
          os: linux
          docker-image: "ubuntu:16.10"
          max-run-time: 600
          command:
             - /bin/bash
             - -c
             - echo "Dummy task"
 
    devedition-promote:
       name: post-langpack-dummy
       description: Dummy task to deal with max_dependencies
       run-on-projects: []
       shipping-phase: promote
       shipping-product: devedition
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
       worker:
          implementation: docker-worker
          os: linux
          docker-image: "ubuntu:16.10"
          max-run-time: 600
          command:
             - /bin/bash
             - -c
--- a/taskcluster/ci/release-bouncer-check/kind.yml
+++ b/taskcluster/ci/release-bouncer-check/kind.yml
@@ -13,17 +13,17 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     name: release-bouncer-check
     description: release bouncer check
     run-on-projects: []  # to make sure this never runs as part of CI
     shipping-phase: push
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1200
         docker-image: {in-tree: "update-verify"}
     run:
         sparse-profile: mozharness
         extra-config:
             by-release-level:
                 production:
--- a/taskcluster/ci/release-eme-free-repack/kind.yml
+++ b/taskcluster/ci/release-eme-free-repack/kind.yml
@@ -15,17 +15,17 @@ kind-dependencies:
    - nightly-l10n-signing
 
 job-defaults:
    name: eme-free-repack
    description: Release Promotion eme-free repacks
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-product: firefox
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       docker-image:
          in-tree: "partner-repack"
       chain-of-trust: true
       max-run-time: 7200
    run:
       using: mozharness
       config:
--- a/taskcluster/ci/release-final-verify/kind.yml
+++ b/taskcluster/ci/release-final-verify/kind.yml
@@ -12,17 +12,17 @@ transforms:
    - taskgraph.transforms.release_deps:transforms
    - taskgraph.transforms.final_verify:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: final-verify
    run-on-projects: []  # to make sure this never runs as part of CI
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       docker-image:
          in-tree: "update-verify"
       max-run-time: 7200
       retry-exit-status: [1]
 
 
 jobs:
--- a/taskcluster/ci/release-generate-checksums/kind.yml
+++ b/taskcluster/ci/release-generate-checksums/kind.yml
@@ -16,17 +16,17 @@ transforms:
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: generate-checksums
    description: generates checksums
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       max-run-time: 1200
       artifacts:
          - name: public/build/SHA256SUMMARY
            path: /builds/worker/SHA256SUMMARY
            type: file
          - name: public/build/SHA256SUMS
            path: /builds/worker/SHA256SUMS
--- a/taskcluster/ci/release-notify-promote/kind.yml
+++ b/taskcluster/ci/release-notify-promote/kind.yml
@@ -14,17 +14,17 @@ kind-dependencies:
    - release-generate-checksums-beetmover
    - release-bouncer-sub
 
 job-defaults:
    name: notify-release-drivers-promote
    description: Sends email to release-drivers telling release was promoted.
    run-on-projects: []
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/release-notify-push/kind.yml
+++ b/taskcluster/ci/release-notify-push/kind.yml
@@ -12,17 +12,17 @@ transforms:
 kind-dependencies:
    - release-beetmover-push-to-release
 
 job-defaults:
    name: notify-release-drivers-push
    description: Sends email to release-drivers telling release was pushed.
    run-on-projects: []
    shipping-phase: push
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/release-notify-ship/kind.yml
+++ b/taskcluster/ci/release-notify-ship/kind.yml
@@ -16,17 +16,17 @@ kind-dependencies:
    - release-version-bump
    - release-mark-as-shipped
 
 job-defaults:
    name: notify-release-drivers-ship
    description: Sends email to release-drivers telling release was shipped.
    run-on-projects: []
    shipping-phase: ship
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/release-notify-started/kind.yml
+++ b/taskcluster/ci/release-notify-started/kind.yml
@@ -10,17 +10,17 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     name: notify-release-drivers-started
     description: Sends email to release-drivers telling release was started.
     run-on-projects: []
     shipping-phase: promote
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: "debian9-base"}
         max-run-time: 600
     emails:
         by-project:
             mozilla-beta: ["release-signoff@mozilla.org"]
             mozilla-release: ["release-signoff@mozilla.org"]
             mozilla-esr60: ["release-signoff@mozilla.org"]
--- a/taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml
+++ b/taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml
@@ -28,17 +28,17 @@ only-for-build-platforms:
    - linux64-nightly/opt
 
 job-template:
    shipping-phase: promote
    shipping-product: firefox
    name: release-partner-repack-chunking-dummy
    description: Dummy task to deal with fanning out Linux partner repacks
    run-on-projects: []
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/release-partner-repack/kind.yml
+++ b/taskcluster/ci/release-partner-repack/kind.yml
@@ -15,17 +15,17 @@ kind-dependencies:
    - nightly-l10n-signing
 
 job-defaults:
    name: partner-repack
    description: Release Promotion partner repacks
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-product: firefox
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       docker-image:
          in-tree: "partner-repack"
       chain-of-trust: true
       max-run-time: 7200
    run:
       using: mozharness
       config:
--- a/taskcluster/ci/release-secondary-final-verify/kind.yml
+++ b/taskcluster/ci/release-secondary-final-verify/kind.yml
@@ -14,17 +14,17 @@ transforms:
    - taskgraph.transforms.release_deps:transforms
    - taskgraph.transforms.final_verify:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: secondary-final-verify
    run-on-projects: []  # to make sure this never runs as part of CI
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       docker-image:
          in-tree: "update-verify"
       max-run-time: 7200
       retry-exit-status: [1]
 
 jobs:
    firefox:
--- a/taskcluster/ci/release-secondary-notify-ship/kind.yml
+++ b/taskcluster/ci/release-secondary-notify-ship/kind.yml
@@ -13,17 +13,17 @@ kind-dependencies:
    - release-secondary-balrog-scheduling
    - push-apk
 
 job-defaults:
    name: notify-release-drivers-ship
    description: Sends email to release-drivers telling release was shipped.
    run-on-projects: []
    shipping-phase: ship
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       docker-image: "ubuntu:16.10"
       max-run-time: 600
       command:
          - /bin/bash
          - -c
--- a/taskcluster/ci/release-secondary-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify-config/kind.yml
@@ -9,17 +9,17 @@ transforms:
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: secondary-update-verify-config
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-product: firefox
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       docker-image:
          in-tree: "update-verify"
       max-run-time: 3600
       artifacts:
          - name: public/build/update-verify.cfg
            path: /builds/worker/checkouts/gecko/update-verify.cfg
            type: file
--- a/taskcluster/ci/release-secondary-update-verify/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify/kind.yml
@@ -15,17 +15,17 @@ transforms:
    - taskgraph.transforms.update_verify:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: secondary-update-verify
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       artifacts:
          - name: 'public/build/diff-summary.log'
            path: '/builds/worker/tools/release/updates/diff-summary.log'
            type: file
       docker-image:
          in-tree: "update-verify"
       max-run-time: 7200
--- a/taskcluster/ci/release-snap-repackage/kind.yml
+++ b/taskcluster/ci/release-snap-repackage/kind.yml
@@ -17,17 +17,17 @@ job-defaults:
    description: Generates snap image
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-phase: promote
    scopes: []
    treeherder:
       platform: linux64-shippable/opt
       kind: build
       tier: 2
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       implementation: docker-worker
       os: linux
       max-run-time: 7200
       docker-image: {in-tree: firefox-snap}
       artifacts:
          - name: public/build
            type: directory
--- a/taskcluster/ci/release-source/kind.yml
+++ b/taskcluster/ci/release-source/kind.yml
@@ -15,17 +15,17 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
 
 job-defaults:
     shipping-phase: promote
     treeherder:
         symbol: Src
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
             PKG_SRCPACK_BASENAME: source
     run:
         using: mozharness
         actions: [package-source]
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -8,17 +8,17 @@ transforms:
    - taskgraph.transforms.update_verify_config:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: update-verify-config
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       docker-image:
          in-tree: "update-verify"
       max-run-time: 3600
       artifacts:
          - name: public/build/update-verify.cfg
            path: /builds/worker/checkouts/gecko/update-verify.cfg
            type: file
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@@ -15,17 +15,17 @@ transforms:
    - taskgraph.transforms.update_verify:transforms
    - taskgraph.transforms.job:transforms
    - taskgraph.transforms.task:transforms
 
 job-defaults:
    name: update-verify
    run-on-projects: []  # to make sure this never runs as part of CI
    shipping-phase: promote
-   worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+   worker-type: b-linux
    worker:
       artifacts:
          - name: 'public/build/diff-summary.log'
            path: '/builds/worker/tools/release/updates/diff-summary.log'
            type: file
       docker-image:
          in-tree: "update-verify"
       max-run-time: 5400
--- a/taskcluster/ci/repo-update/kind.yml
+++ b/taskcluster/ci/repo-update/kind.yml
@@ -55,17 +55,17 @@ jobs:
       name: periodic_file_update
       description: HSTS, HPKP, Blocklist and remote settings update
       run-on-projects: []  # Only run via cron
       treeherder:
          kind: build
          platform: linux64/opt
          symbol: pfu
          tier: 1
-      worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+      worker-type: b-linux
       worker:
          implementation: docker-worker
          os: linux
          docker-image: {in-tree: periodic-updates}
          max-run-time: 10800  # Takes 2-3 hours
          env:
             PRODUCT: firefox
             REVIEWERS: "ryanvm"
--- a/taskcluster/ci/searchfox/kind.yml
+++ b/taskcluster/ci/searchfox/kind.yml
@@ -26,17 +26,17 @@ job-defaults:
 
 jobs:
     linux64-searchfox/debug:
         description: "Linux64 Debug Searchfox"
         index:
             job-name: linux64-searchfox-debug
         treeherder:
             platform: linux64/debug
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 36000
             env:
                 PERFHERDER_EXTRA_OPTIONS: searchfox
                 RUSTC_BOOTSTRAP: "1"
                 MOZSEARCH_PLATFORM: "linux"
         run:
             using: mozharness
@@ -56,17 +56,17 @@ jobs:
             - linux64-cbindgen
 
     macosx64-searchfox/debug:
         description: "MacOS X x64 Debug Cross-compile Searchfox"
         index:
             job-name: macosx64-searchfox-debug
         treeherder:
             platform: osx-cross/debug
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             max-run-time: 36000
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
                 PERFHERDER_EXTRA_OPTIONS: searchfox
                 RUSTC_BOOTSTRAP: "1"
                 MOZSEARCH_PLATFORM: "macosx"
         run:
@@ -94,17 +94,17 @@ jobs:
 
     win64-searchfox/debug:
         description: "Win64 Searchfox Debug (clang-cl)"
         index:
             product: firefox
             job-name: win64-searchfox-debug
         treeherder:
             platform: windows2012-64/debug
-        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+        worker-type: b-win2012
         worker:
             max-run-time: 36000
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
                 PERFHERDER_EXTRA_OPTIONS: searchfox
                 RUSTC_BOOTSTRAP: "1"
                 MOZSEARCH_PLATFORM: "windows"
         run:
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -4,17 +4,17 @@ job-defaults:
     run-on-projects:
         - try
 
     platform: linux64/opt
     attributes:
         code-review: true
     worker-type:
         by-platform:
-            linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
+            linux64.*: t-linux-xlarge
     worker:
         docker-image: {in-tree: debian7-amd64-build}
         max-run-time: 5400
     treeherder:
         kind: other
         tier: 2
     run:
         using: run-task
--- a/taskcluster/ci/source-test/coverity.yml
+++ b/taskcluster/ci/source-test/coverity.yml
@@ -3,17 +3,17 @@ job-defaults:
     # to avoid running Coverity SA on the whole codebase
     run-on-projects:
         - try
     platform: linux64/opt
     attributes:
         code-review: true
     worker-type:
         by-platform:
-            linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
+            linux64.*: t-linux-xlarge
     worker:
         docker-image: {in-tree: debian7-amd64-build}
         max-run-time: 5400
     treeherder:
         kind: other
         tier: 2
     run:
         using: run-task
--- a/taskcluster/ci/source-test/cram.yml
+++ b/taskcluster/ci/source-test/cram.yml
@@ -1,17 +1,17 @@
 ---
 tryselect:
     description: tools/tryselect integration tests
     platform: linux64/opt
     treeherder:
         symbol: cram(try)
         kind: test
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
     run:
         using: mach
         mach: cramtest tools/tryselect
     when:
         files-changed:
--- a/taskcluster/ci/source-test/doc.yml
+++ b/taskcluster/ci/source-test/doc.yml
@@ -1,17 +1,17 @@
 generate:
     description: Generate the Sphinx documentation
     platform: lint/opt
     treeherder:
         symbol: Doc
         kind: test
         tier: 1
     run-on-projects: ['trunk', 'try']
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
         artifacts:
             - type: file
               name: public/docs.tar.gz
               path: /builds/worker/checkouts/gecko/docs-out/main.tar.gz
     run:
@@ -24,17 +24,17 @@ generate:
 upload:
     description: Generate and upload the Sphinx documentation
     platform: lint/opt
     treeherder:
         symbol: DocUp
         kind: test
         tier: 2
     run-on-projects: [mozilla-central]
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
         taskcluster-proxy: true
     run:
         using: mach
         mach: doc --upload --no-open --no-serve
         sparse-profile: sphinx-docs
--- a/taskcluster/ci/source-test/file-metadata.yml
+++ b/taskcluster/ci/source-test/file-metadata.yml
@@ -1,14 +1,14 @@
 job-defaults:
     platform: lint/opt
     treeherder:
         kind: test
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
 
 bugzilla-components:
     description: Generate metadata about source files and Bugzilla
     treeherder:
         symbol: Bugzilla
--- a/taskcluster/ci/source-test/infer.yml
+++ b/taskcluster/ci/source-test/infer.yml
@@ -4,17 +4,17 @@ job-defaults:
     run-on-projects:
         - try
 
     platform: linux64/opt
     attributes:
         code-review: true
     worker-type:
         by-platform:
-            linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
+            linux64.*: t-linux-xlarge
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 5400
     treeherder:
         kind: other
         tier: 2
     run:
         using: run-task
--- a/taskcluster/ci/source-test/jsshell.yml
+++ b/taskcluster/ci/source-test/jsshell.yml
@@ -1,14 +1,14 @@
 job-defaults:
     platform: linux64/opt
     require-build: true
     worker-type:
         by-platform:
-            linux64.*: releng-hardware/gecko-t-linux-talos
+            linux64.*: t-linux-talos
     worker:
         by-platform:
             linux64.*:
                 env:
                     by-shell:
                         sm:
                             SHELL: /bin/bash
                             JSSHELL: /home/cltbld/fetches/js
--- a/taskcluster/ci/source-test/mozlint.yml
+++ b/taskcluster/ci/source-test/mozlint.yml
@@ -1,16 +1,16 @@
 job-defaults:
     always-target: true
     attributes:
         code-review: true
     treeherder:
         kind: test
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
         artifacts:
             - type: file
               name: public/code-review/mozlint.json
               path: /builds/worker/mozlint.json
     run:
--- a/taskcluster/ci/source-test/node.yml
+++ b/taskcluster/ci/source-test/node.yml
@@ -1,16 +1,16 @@
 debugger-tests:
     description: devtools debugger unit tests and flow type checks
     platform: linux64/opt
     treeherder:
         symbol: node(debugger)
         kind: test
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
     run:
         using: run-task
         cache-dotcache: true
         command: >
             cd /builds/worker/checkouts/gecko/ &&
@@ -24,17 +24,17 @@ debugger-tests:
 
 devtools-tests:
     description: devtools node-based tests (for instance jest)
     platform: linux64/opt
     treeherder:
         symbol: node(devtools)
         kind: test
         tier: 3
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
     run:
         using: run-task
         cache-dotcache: true
         command: >
             cd /builds/worker/checkouts/gecko/ &&
@@ -60,17 +60,17 @@ devtools-tests:
 
 eslint-plugin-mozilla:
     description: eslint-plugin-mozilla integration tests
     platform: linux64/opt
     treeherder:
         symbol: node(epm)
         kind: test
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
     run:
         using: run-task
         cache-dotcache: true
         command: >
             cd /builds/worker/checkouts/gecko/tools/lint/eslint/eslint-plugin-mozilla &&
--- a/taskcluster/ci/source-test/python.yml
+++ b/taskcluster/ci/source-test/python.yml
@@ -1,16 +1,16 @@
 job-defaults:
     platform: linux64/opt
     always-target: true
     worker-type:
         by-platform:
-            linux64.*: aws-provisioner-v1/gecko-t-linux-xlarge
-            macosx64.*: releng-hardware/gecko-t-osx-1010
-            windows10-64.*: aws-provisioner-v1/gecko-t-win10-64
+            linux64.*: t-linux-xlarge
+            macosx64.*: t-osx-1010
+            windows10-64.*: t-win10-64
     worker:
         by-platform:
             linux64.*:
                 docker-image: {in-tree: "lint"}
                 max-run-time: 3600
             default:
                 max-run-time: 3600
     treeherder:
--- a/taskcluster/ci/source-test/webidl.yml
+++ b/taskcluster/ci/source-test/webidl.yml
@@ -1,16 +1,16 @@
 test:
     description: WebIDL parser tests
     platform: lint/opt
     treeherder:
         symbol: Wp
         kind: test
         tier: 1
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
     run:
         using: mach
         mach: webidl-parser-test --verbose
     when:
         files-changed:
--- a/taskcluster/ci/source-test/wpt-manifest.yml
+++ b/taskcluster/ci/source-test/wpt-manifest.yml
@@ -1,14 +1,14 @@
 job-defaults:
     platform: linux64/opt
     treeherder:
         kind: test
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
 
 upload:
     description: Generate and store the web-platform-tests manifest
     treeherder:
         symbol: Wm
--- a/taskcluster/ci/source-test/wpt-metadata.yml
+++ b/taskcluster/ci/source-test/wpt-metadata.yml
@@ -1,14 +1,14 @@
 job-defaults:
     platform: lint/opt
     treeherder:
         kind: test
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
 
 summary:
     description: Summarize wpt metadata
     treeherder:
         symbol: wpt-meta
--- a/taskcluster/ci/spidermonkey/kind.yml
+++ b/taskcluster/ci/spidermonkey/kind.yml
@@ -18,17 +18,17 @@ transforms:
 job-defaults:
     attributes:
         retrigger: true
     treeherder:
         kind: build
         tier: 1
     index:
         product: firefox
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     run:
         using: spidermonkey
     when:
         files-changed:
             # any when.files-changed specified below in a job will be
             # appended to this list
             - build/**
             - config/**
--- a/taskcluster/ci/spidermonkey/windows.yml
+++ b/taskcluster/ci/spidermonkey/windows.yml
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
 
 sm-plain-win64/debug:
     description: "Spidermonkey Plain win64 debug"
     index:
--- a/taskcluster/ci/static-analysis-autotest/kind.yml
+++ b/taskcluster/ci/static-analysis-autotest/kind.yml
@@ -35,17 +35,17 @@ job-defaults:
 
 jobs:
     linux64-st-autotest/debug:
         description: "Linux64 Debug Static Analysis Autotest"
         index:
             job-name: linux64-st-autotest-debug
         treeherder:
             platform: linux64/debug
-        worker-type: aws-provisioner-v1/gecko-t-linux-large
+        worker-type: t-linux-large
         worker:
             docker-image: {in-tree: static-analysis-build}
             env:
                 # clang-tidy needs a recent libstdc++, which can be found in the clang
                 # toolchain.
                 LD_LIBRARY_PATH: /builds/worker/workspace/build/src/clang/lib
                 PERFHERDER_EXTRA_OPTIONS: static-analysis-autotest
         run:
@@ -67,17 +67,17 @@ jobs:
     win64-st-autotest/debug:
         description: "Win64 Debug Static Analysis Autotest"
         run-on-projects: []  # Don't run by default until bug 1503453 has been fixed.
         index:
             job-name: win64-st-autotest-debug
         treeherder:
             platform: windows2012-64/debug
             tier: 2
-        worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+        worker-type: b-win2012
         worker:
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
         run:
             config:
                 - builds/releng_base_firefox.py
                 - builds/taskcluster_base_windows.py
                 - builds/taskcluster_base_win64.py
--- a/taskcluster/ci/toolchain/android.yml
+++ b/taskcluster/ci/toolchain/android.yml
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 1800
 
 linux64-android-sdk-linux-repack:
     description: "Android SDK (Linux) repack toolchain build"
     treeherder:
         symbol: TL(android-sdk-linux)
--- a/taskcluster/ci/toolchain/cbindgen.yml
+++ b/taskcluster/ci/toolchain/cbindgen.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "cbindgen toolchain build"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
     run:
         script: build-cbindgen.sh
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/cbindgen.tar.xz
 
@@ -39,17 +39,17 @@ macosx64-cbindgen:
         - linux64-cctools-port
         - linux64-clang-8
         - linux64-llvm-dsymutil
         - linux64-rust-macos-1.32
 
 win64-cbindgen:
     treeherder:
         symbol: TW64(cbindgen)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         arguments: ['x86_64-pc-windows-msvc']
         toolchain-artifact: public/build/cbindgen.tar.bz2
     toolchains:
         - win64-rust-1.34
--- a/taskcluster/ci/toolchain/cctools-port.yml
+++ b/taskcluster/ci/toolchain/cctools-port.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "cctools-port toolchain build"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run:
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 linux64-cctools-port:
     treeherder:
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "Clang-tidy build"
     index:
         product: static-analysis
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large
+    worker-type: b-linux-large
     worker:
         max-run-time: 3600
     run:
         toolchain-artifact: public/build/clang-tidy.tar.xz
         resources:
             - 'build/clang-plugin/**/*.cpp'
             - 'build/clang-plugin/**/*.h'
             - 'build/clang-plugin/*.inc'
@@ -36,17 +36,17 @@ linux64-clang-tidy:
     toolchains:
         - linux64-gcc-6
 
 macosx64-clang-tidy:
     index:
         job-name: macosx64-clang-tidy
     treeherder:
         symbol: TM(clang-tidy)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large
+    worker-type: b-linux-large
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy-macosx.sh
         tooltool-downloads: internal
         resources:
@@ -60,17 +60,17 @@ macosx64-clang-tidy:
 
 win64-clang-tidy:
     description: "Clang-tidy toolchain build"
     index:
         job-name: win64-clang-tidy
     treeherder:
         symbol: TW64(clang-tidy)
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         script: build-clang-tidy64-windows.sh
         resources:
             - 'build/build-clang/clang-tidy-win64.json'
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -1,25 +1,25 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-xlarge
+    worker-type: b-linux-xlarge
     worker:
         max-run-time: 7200
     run:
         resources:
             - 'build/build-clang/build-clang.py'
 
 linux64-clang-4.0:
     description: "Clang 4.0 toolchain build"
     treeherder:
         symbol: TL(clang4.0)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large
+    worker-type: b-linux-large
     run:
         script: build-clang-4.0-linux.sh
         resources:
             - 'build/build-clang/clang-4.0-linux64.json'
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/clang.tar.xz
     toolchains:
         - linux64-gcc-6
@@ -105,17 +105,17 @@ linux64-clang-8-android-cross:
     toolchains:
         - linux64-gcc-6
         - linux64-android-ndk-linux-repack
 
 linux64-clang-8-aarch64-cross:
     description: "Clang 8 toolchain build with aarch64 runtime"
     treeherder:
         symbol: TL(clang8-aarch64)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         docker-image: {in-tree: toolchain-arm64-build}
     run:
         using: toolchain-script
         script: build-clang-8-linux-aarch64-cross.sh
         resources:
             - 'build/build-clang/clang-8-linux64-aarch64-cross.json'
@@ -125,17 +125,17 @@ linux64-clang-8-aarch64-cross:
     toolchains:
         - linux64-binutils
         - linux64-gcc-6
 
 linux64-clang-8-macosx-cross:
     description: "Clang 8 toolchain build with MacOS Compiler RT libs"
     treeherder:
         symbol: TL(clang8-macosx-cross)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         script: build-clang-8-linux-macosx-cross.sh
         resources:
             - 'build/build-clang/clang-8-macosx64.json'
@@ -147,17 +147,17 @@ linux64-clang-8-macosx-cross:
         - linux64-cctools-port
         - linux64-clang-8
         - linux64-gcc-6
 
 macosx64-clang:
     description: "Clang toolchain build"
     treeherder:
         symbol: TM(clang)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux-large
+    worker-type: b-linux-large
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run-on-projects:
         - trunk
         - try
     run:
@@ -172,17 +172,17 @@ macosx64-clang:
         - linux64-clang-8
         - linux64-gcc-6
         - linux64-node
 
 win64-clang-cl:
     description: "Clang-cl toolchain build"
     treeherder:
         symbol: TW64(clang-cl)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         script: build-clang64-windows.sh
         resources:
             - 'build/build-clang/clang-win64.json'
             - 'taskcluster/scripts/misc/build-clang-windows-helper64.sh'
--- a/taskcluster/ci/toolchain/gcc.yml
+++ b/taskcluster/ci/toolchain/gcc.yml
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 3600
     run:
         resources:
             - 'build/unix/build-gcc/build-gcc.sh'
         toolchain-artifact: public/build/gcc.tar.xz
 
 linux64-gcc-6:
--- a/taskcluster/ci/toolchain/gn.yml
+++ b/taskcluster/ci/toolchain/gn.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "gn toolchain build"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run-on-projects:
         - trunk
         - try
     run:
         tooltool-downloads: public
         resources:
@@ -37,16 +37,16 @@ macosx64-gn:
     toolchains:
         - linux64-cctools-port
         - linux64-clang-8
         - linux64-node
 
 win32-gn:
     treeherder:
         symbol: TW32(gn)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/gn-build.manifest"
     run:
         script: build-gn-win32.sh
         toolchain-artifact: public/build/gn.tar.bz2
--- a/taskcluster/ci/toolchain/grcov.yml
+++ b/taskcluster/ci/toolchain/grcov.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "grcov toolchain build"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run:
         script: build-grcov.sh
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/grcov.tar.xz
 
@@ -26,16 +26,16 @@ macosx64-grcov:
         - trunk
         - try
     toolchains:
         - linux64-rust-1.32
 
 win64-grcov:
     treeherder:
         symbol: TW64(grcov)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         toolchain-artifact: public/build/grcov.tar.bz2
     toolchains:
         - win64-rust-1.34
--- a/taskcluster/ci/toolchain/mingw.yml
+++ b/taskcluster/ci/toolchain/mingw.yml
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     treeherder:
         tier: 2
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: mingw32-build}
         max-run-time: 3600
 
 linux64-upx:
     description: "UPX build for MinGW32 Cross Compile"
     treeherder:
         symbol: TMW(upx)
--- a/taskcluster/ci/toolchain/minidump_stackwalk.yml
+++ b/taskcluster/ci/toolchain/minidump_stackwalk.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "minidump_stackwalk toolchain build"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run:
         script: build-minidump-stackwalk.sh
         sparse-profile: null
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/minidump_stackwalk.tar.xz
--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
 
 linux64-infer:
     description: "infer build"
     index:
         product: static-analysis
         job-name: linux64-infer
--- a/taskcluster/ci/toolchain/nasm.yml
+++ b/taskcluster/ci/toolchain/nasm.yml
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run:
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
         toolchain-artifact: public/build/nasm.tar.bz2
 
 win64-nasm:
--- a/taskcluster/ci/toolchain/node.yml
+++ b/taskcluster/ci/toolchain/node.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "Node repack toolchain build"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run:
         script: repack-node.sh
         toolchain-artifact: public/build/node.tar.xz
 
 linux64-node:
     treeherder:
--- a/taskcluster/ci/toolchain/rust-size.yml
+++ b/taskcluster/ci/toolchain/rust-size.yml
@@ -9,25 +9,25 @@ job-defaults:
     run:
         script: build-rust-size.sh
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 linux64-rust-size:
     treeherder:
         symbol: TL(rust-size)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     run:
         toolchain-artifact: public/build/rust-size.tar.xz
     toolchains:
         - linux64-rust-1.28
 
 win64-rust-size:
     treeherder:
         symbol: TW64(rust-size)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         toolchain-artifact: public/build/rust-size.tar.bz2
     toolchains:
         - win64-rust-1.28
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 job-defaults:
     description: "rust repack"
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 7200
         env:
             UPLOAD_DIR: artifacts
     run:
         script: repack_rust.py
         toolchain-artifact: public/build/rustc.tar.xz
 
--- a/taskcluster/ci/toolchain/sccache.yml
+++ b/taskcluster/ci/toolchain/sccache.yml
@@ -10,29 +10,29 @@ job-defaults:
         using: toolchain-script
         script: build-sccache.sh
         resources:
             - 'taskcluster/scripts/misc/tooltool-download.sh'
 
 linux64-sccache:
     treeherder:
         symbol: TL(sccache)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         max-run-time: 1800
     run:
         toolchain-artifact: public/build/sccache2.tar.xz
     toolchains:
         - linux64-rust-1.34
         - linux64-binutils
 
 win64-sccache:
     treeherder:
         symbol: TW64(sccache)
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
+    worker-type: b-win2012
     worker:
         max-run-time: 3600
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         toolchain-artifact: public/build/sccache2.tar.bz2
     toolchains:
         - win64-rust-1.34
--- a/taskcluster/ci/upload-generated-sources/kind.yml
+++ b/taskcluster/ci/upload-generated-sources/kind.yml
@@ -13,17 +13,17 @@ kind-dependencies:
     - build
 
 only-for-attributes:
     - nightly
     - shippable
 
 job-template:
     description: Upload generated source files from build
-    worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
+    worker-type: t-linux-xlarge
     treeherder:
         symbol: Ugs
         kind: build
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 600
     run:
         using: mach
--- a/taskcluster/ci/upload-symbols/kind.yml
+++ b/taskcluster/ci/upload-symbols/kind.yml
@@ -14,17 +14,17 @@ kind-dependencies:
 
 not-for-build-platforms:
     # Address Sanitizer builds don't have symbols to upload.
     - linux64-asan-reporter-nightly/opt
     - win64-asan-reporter-nightly/opt
 
 job-template:
     description: Upload Symbols
-    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker-type: b-linux
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 900
         env:
             # {level} gets replaced in the upload_symbols transform
             SYMBOL_SECRET: "project/releng/gecko/build/level-{level}/gecko-symbol-upload"
     run:
         using: mach
--- a/taskcluster/ci/valgrind/kind.yml
+++ b/taskcluster/ci/valgrind/kind.yml
@@ -24,17 +24,17 @@ jobs:
         index:
             product: firefox
             job-name: linux64-valgrind-opt
         treeherder:
             platform: linux64/opt
             symbol: V
             kind: build
             tier: 1
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: valgrind-build}
             max-run-time: 72000
             env:
                 PERFHERDER_EXTRA_OPTIONS: valgrind
         run:
             using: mozharness
             actions: [get-secrets, build, valgrind-test]
--- a/taskcluster/ci/webrender/kind.yml
+++ b/taskcluster/ci/webrender/kind.yml
@@ -23,34 +23,34 @@ job-defaults:
         max-run-time: 1800
         env:
             RUST_BACKTRACE: 'full'
             RUSTFLAGS: '--deny warnings'
 
 jobs:
     lint-tidy:
         description: Runs linting checks on WebRender code
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: webrender}
         run:
             using: run-task
             command: >-
                 cd $HOME/checkouts/gecko/gfx/wr &&
                 servo-tidy
         treeherder:
             platform: linux64-qr/opt
             symbol: WR(tidy)
         when:
             files-changed:
                 - 'gfx/wr/**'
 
     linux-release:
         description: Runs release-mode WebRender CI tests on a Linux worker
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: webrender}
         toolchains:
             - linux64-rust
             - wrench-deps
         run:
             using: run-task
             command: >-
@@ -65,17 +65,17 @@ jobs:
             symbol: WR(wrench)
             kind: other
         when:
             files-changed:
                 - 'gfx/wr/**'
 
     linux-debug:
         description: Runs debug-mode WebRender CI tests on a Linux worker
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: webrender}
         toolchains:
             - linux64-rust
             - wrench-deps
         run:
             using: run-task
             command: >-
@@ -90,17 +90,17 @@ jobs:
             symbol: WR(wrench)
             kind: other
         when:
             files-changed:
                 - 'gfx/wr/**'
 
     wrench-macos-build:
         description: Cross compilation of wrench for macOS on Linux
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: webrender}
             env:
                 TOOLTOOL_MANIFEST: "/builds/worker/checkouts/gecko/browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
             chain-of-trust: true
             artifacts:
                 - type: file
                   name: public/build/wrench-macos.tar.bz2
@@ -125,17 +125,17 @@ jobs:
             files-changed:
                 - 'gfx/wr/**'
                 - 'taskcluster/scripts/misc/tooltool-download.sh'
                 - 'taskcluster/scripts/misc/wr-macos-cross-build-setup.sh'
                 - 'taskcluster/scripts/misc/wrench-macos-build.sh'
 
     macos-release:
         description: Runs release-mode WebRender CI tests on a macOS worker
-        worker-type: releng-hardware/gecko-t-osx-1010
+        worker-type: t-osx-1010
         worker:
             max-run-time: 3600
             env:
                 MOZ_FETCHES_DIR: 'checkouts/gecko/gfx/wr'
         dependencies:
             webrender-wrench-macos-build: webrender-wrench-macos-build
         fetches:
             webrender-wrench-macos-build:
@@ -152,17 +152,17 @@ jobs:
             platform: macosx64-qr/opt
             symbol: WR(wrench)
         when:
             files-changed:
                 - 'gfx/wr/**'
 
     cargotest-macos-build:
         description: Cross compilation of cargo tests for macOS on Linux
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+        worker-type: b-linux
         worker:
             docker-image: {in-tree: webrender}
             env:
                 TOOLTOOL_MANIFEST: "/builds/worker/checkouts/gecko/browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
             chain-of-trust: true
             artifacts:
                 - type: file
                   name: public/build/cargo-test-binaries.tar.bz2
@@ -184,17 +184,17 @@ jobs:
             files-changed:
                 - 'gfx/wr/**'
                 - 'taskcluster/scripts/misc/tooltool-download.sh'
                 - 'taskcluster/scripts/misc/wr-cargotest-macos-build.sh'
                 - 'taskcluster/scripts/misc/wr-macos-cross-build-setup.sh'
 
     macos-debug:
         description: Runs debug-mode WebRender CI tests on a macOS worker
-        worker-type: releng-hardware/gecko-t-osx-1010
+        worker-type: t-osx-1010
         worker:
             max-run-time: 3600
             env:
                 MOZ_FETCHES_DIR: 'checkouts/gecko/gfx/wr'
         dependencies:
             webrender-cargotest-macos-build: webrender-cargotest-macos-build
         fetches:
             webrender-cargotest-macos-build:
@@ -210,17 +210,17 @@ jobs:
             platform: macosx64-qr/debug
             symbol: WR(cargotest)
         when:
             files-changed:
                 - 'gfx/wr/**'
 
     windows:
         description: Runs WebRender CI tests on a Windows worker
-        worker-type: aws-provisioner-v1/gecko-t-win10-64
+        worker-type: t-win10-64
         worker:
             max-run-time: 5400
             env:
                 TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/win64/webrender.manifest'
         toolchains:
             - win64-rust
             - wrench-deps
         run:
--- a/taskcluster/taskgraph/transforms/diffoscope.py
+++ b/taskcluster/taskgraph/transforms/diffoscope.py
@@ -119,18 +119,17 @@ def fill_template(config, tasks):
             'label': 'diff-' + name,
             'description': name,
             'treeherder': {
                 'symbol': task['symbol'],
                 'platform': 'diff/opt',
                 'kind': 'other',
                 'tier': 2,
             },
-            'worker-type': 'aws-provisioner-v1/gecko-{}-b-linux'.format(
-               config.params['level']),
+            'worker-type': 'b-linux',
             'worker': {
                 'docker-image': {'in-tree': 'diffoscope'},
                 'artifacts': [{
                     'type': 'file',
                     'path': '/builds/worker/diff.html',
                     'name': 'public/diff.html',
                 }, {
                     'type': 'file',
--- a/taskcluster/taskgraph/transforms/docker_image.py
+++ b/taskcluster/taskgraph/transforms/docker_image.py
@@ -157,18 +157,17 @@ def fill_template(config, tasks):
             ],
             'treeherder': {
                 'symbol': job_symbol,
                 'platform': 'taskcluster-images/opt',
                 'kind': 'other',
                 'tier': 1,
             },
             'run-on-projects': [],
-            'worker-type': 'aws-provisioner-v1/gecko-{}-images'.format(
-                config.params['level']),
+            'worker-type': 'images',
             'worker': {
                 'implementation': 'docker-worker',
                 'os': 'linux',
                 'artifacts': [{
                     'type': 'file',
                     'path': '/builds/worker/workspace/artifacts/image.tar.zst',
                     'name': 'public/image.tar.zst',
                 }],
--- a/taskcluster/taskgraph/transforms/fetch.py
+++ b/taskcluster/taskgraph/transforms/fetch.py
@@ -135,17 +135,17 @@ def make_base_task(config, name, descrip
             'platform': 'fetch/opt',
             'tier': 1,
         },
         'run': {
             'using': 'run-task',
             'checkout': False,
             'command': command,
         },
-        'worker-type': 'aws-provisioner-v1/gecko-{level}-images',
+        'worker-type': 'images',
         'worker': {
             'chain-of-trust': True,
             'docker-image': {'in-tree': 'fetch'},
             'env': {},
             'max-run-time': 900,
         },
     }
 
--- a/taskcluster/taskgraph/transforms/job/mozharness.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness.py
@@ -240,17 +240,17 @@ def mozharness_on_docker_worker_setup(co
     ]
 
     worker['command'] = command
 
 
 @run_job_using("generic-worker", "mozharness", schema=mozharness_run_schema,
                defaults=mozharness_defaults)
 def mozharness_on_generic_worker(config, job, taskdesc):
-    assert job['worker']['os'] == 'windows', 'only supports windows right now'
+    assert job['worker']['os'] == 'windows', 'only supports windows right now: {}'.format(job['label'])
 
     run = job['run']
 
     # fail if invalid run options are included
     invalid = []
     for prop in ['tooltool-downloads', 'taskcluster-proxy', 'need-xvfb']:
         if prop in run and run[prop]:
             invalid.append(prop)
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -242,17 +242,17 @@ def mozharness_test_on_generic_worker(co
 
     # run-as-administrator is a feature for workers with UAC enabled and as such should not be
     # included in tasks on workers that have UAC disabled. Currently UAC is only enabled on
     # gecko Windows 10 workers, however this may be subject to change. Worker type
     # environment definitions can be found in https://github.com/mozilla-releng/OpenCloudConfig
     # See https://docs.microsoft.com/en-us/windows/desktop/secauthz/user-account-control
     # for more information about UAC.
     if test.get('run-as-administrator', False):
-        if job['worker-type'].startswith('aws-provisioner-v1/gecko-t-win10-64'):
+        if job['worker-type'].startswith('t-win10-64'):
             worker['run-as-administrator'] = True
         else:
             raise Exception('run-as-administrator not supported on {}'.format(job['worker-type']))
 
     if test['reboot']:
         raise Exception('reboot: {} not supported on generic-worker'.format(test['reboot']))
 
     worker['max-run-time'] = test['max-run-time']
--- a/taskcluster/taskgraph/transforms/l10n.py
+++ b/taskcluster/taskgraph/transforms/l10n.py
@@ -379,17 +379,17 @@ def make_job_description(config, jobs):
                 'symbol': job['treeherder']['symbol'],
                 'platform': job['treeherder']['platform'],
             },
             'run-on-projects': job.get('run-on-projects') if job.get('run-on-projects') else [],
         }
         if job.get('extra'):
             job_description['extra'] = job['extra']
 
-        if job['worker-type'].endswith("-b-win2012"):
+        if job['worker-type'] == "b-win2012":
             job_description['worker'] = {
                 'os': 'windows',
                 'max-run-time': 7200,
                 'chain-of-trust': True,
             }
             job_description['run']['use-simple-package'] = False
             job_description['run']['use-magic-mh-args'] = False
         else:
--- a/taskcluster/taskgraph/transforms/partials.py
+++ b/taskcluster/taskgraph/transforms/partials.py
@@ -137,17 +137,17 @@ def make_task_description(config, jobs):
             worker['env']['ACCEPTED_MAR_CHANNEL_IDS'] = mar_channel_id
         if config.params.release_level() == 'staging':
             worker['env']['FUNSIZE_ALLOW_STAGING_PREFIXES'] = 'true'
 
         task = {
             'label': label,
             'description': "{} Partials".format(
                 dep_job.task["metadata"]["description"]),
-            'worker-type': 'aws-provisioner-v1/gecko-%s-b-linux' % level,
+            'worker-type': 'b-linux',
             'dependencies': dependencies,
             'scopes': [
                 'secrets:get:project/releng/gecko/build/level-%s/datadog-api-key' % level
             ],
             'attributes': attributes,
             'run-on-projects': dep_job.attributes.get('run_on_projects'),
             'treeherder': treeherder,
             'extra': extra,
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -247,17 +247,16 @@ def make_job_description(config, jobs):
             # Use string splice to strip out 'nightly-l10n-' .. '-<chunk>/opt'
             # We need this additional dependency to support finding the mar binary
             # Which is needed in order to generate a new complete.mar
             dependencies['build'] = "build-{}/opt".format(
                 dependencies[build_task][13:dependencies[build_task].rfind('-')])
             build_task = 'build'
             _fetch_subst_locale = locale
 
-        level = config.params['level']
         build_platform = attributes['build_platform']
 
         use_stub = attributes.get('stub-installer')
 
         repackage_config = []
         package_formats = job.get('package-formats')
         if use_stub and not repackage_signing_task:
             # if repackage_signing_task doesn't exists, generate the stub installer
@@ -305,22 +304,22 @@ def make_job_description(config, jobs):
             'skip-artifacts': True,
         }
 
         if locale:
             # Make sure we specify the locale-specific upload dir
             worker.setdefault('env', {}).update(LOCALE=locale)
 
         if build_platform.startswith('win'):
-            worker_type = 'aws-provisioner-v1/gecko-%s-b-win2012' % level
+            worker_type = 'b-win2012'
             run['use-magic-mh-args'] = False
             run['use-caches'] = False
         else:
             if build_platform.startswith(('linux', 'macosx')):
-                worker_type = 'aws-provisioner-v1/gecko-%s-b-linux' % level
+                worker_type = 'b-linux'
             else:
                 raise NotImplementedError(
                     'Unsupported build_platform: "{}"'.format(build_platform)
                 )
 
             run['tooltool-downloads'] = 'internal'
             worker['docker-image'] = {"in-tree": "debian7-amd64-build"}
 
--- a/taskcluster/taskgraph/transforms/repackage_partner.py
+++ b/taskcluster/taskgraph/transforms/repackage_partner.py
@@ -123,17 +123,16 @@ def make_job_description(config, jobs):
         for dependency in dependencies.keys():
             if build_platform.startswith('macosx') and dependency.endswith('signing'):
                 signing_task = dependency
             elif build_platform.startswith('win') and dependency.endswith('repack'):
                 signing_task = dependency
 
         attributes['repackage_type'] = 'repackage'
 
-        level = config.params['level']
         repack_id = job['extra']['repack_id']
 
         repackage_config = []
         for format in job.get('package-formats'):
             command = copy.deepcopy(PACKAGE_FORMATS[format])
             substs = {
                 'archive_format': archive_format(build_platform),
                 'executable_extension': executable_extension(build_platform),
@@ -163,21 +162,21 @@ def make_job_description(config, jobs):
             'env': {
                 'REPACK_ID': repack_id,
             },
             # Don't add generic artifact directory.
             'skip-artifacts': True,
         }
 
         if build_platform.startswith('win'):
-            worker_type = 'aws-provisioner-v1/gecko-%s-b-win2012' % level
+            worker_type = 'b-win2012'
             run['use-magic-mh-args'] = False
         else:
             if build_platform.startswith('macosx'):
-                worker_type = 'aws-provisioner-v1/gecko-%s-b-linux' % level
+                worker_type = 'b-linux'
             else:
                 raise NotImplementedError(
                     'Unsupported build_platform: "{}"'.format(build_platform)
                 )
 
             run['tooltool-downloads'] = 'internal'
             worker['docker-image'] = {"in-tree": "debian7-amd64-build"}
 
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -44,113 +44,113 @@ from voluptuous import (
     Exclusive,
 )
 
 import copy
 import logging
 
 # default worker types keyed by instance-size
 LINUX_WORKER_TYPES = {
-    'large': 'aws-provisioner-v1/gecko-t-linux-large',
-    'xlarge': 'aws-provisioner-v1/gecko-t-linux-xlarge',
-    'default': 'aws-provisioner-v1/gecko-t-linux-large',
+    'large': 't-linux-large',
+    'xlarge': 't-linux-xlarge',
+    'default': 't-linux-large',
 }
 
 # windows worker types keyed by test-platform and virtualization
 WINDOWS_WORKER_TYPES = {
     'windows7-32': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win7-32',
+      'virtual-with-gpu': 't-win7-32-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows7-32-pgo': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win7-32',
+      'virtual-with-gpu': 't-win7-32-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows7-32-nightly': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win7-32',
+      'virtual-with-gpu': 't-win7-32-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows7-32-shippable': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win7-32',
+      'virtual-with-gpu': 't-win7-32-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows7-32-devedition': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win7-32',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win7-32',
+      'virtual-with-gpu': 't-win7-32-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-aarch64': {
-      'virtual': 'bitbar/gecko-t-win64-aarch64-laptop',
-      'virtual-with-gpu': 'bitbar/gecko-t-win64-aarch64-laptop',
-      'hardware': 'bitbar/gecko-t-win64-aarch64-laptop',
+      'virtual': 't-win64-aarch64-laptop',
+      'virtual-with-gpu': 't-win64-aarch64-laptop',
+      'hardware': 't-win64-aarch64-laptop',
     },
     'windows10-64-ccov': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-pgo': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-devedition': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-nightly': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-shippable': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-asan': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-qr': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-pgo-qr': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-shippable-qr': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-hw',
     },
     'windows10-64-ux': {
-      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
-      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
-      'hardware': 'releng-hardware/gecko-t-win10-64-ux',
+      'virtual': 't-win10-64',
+      'virtual-with-gpu': 't-win10-64-gpu',
+      'hardware': 't-win10-64-ux',
     },
 }
 
 # os x worker types keyed by test-platform
 MACOSX_WORKER_TYPES = {
-    'macosx64': 'releng-hardware/gecko-t-osx-1010',
+    'macosx64': 't-osx-1010',
 }
 
 
 def runs_on_central(test):
     return match_run_on_projects('mozilla-central', test['run-on-projects'])
 
 
 TEST_VARIANTS = {
@@ -1198,17 +1198,17 @@ def set_worker_type(config, tests):
                 test['worker-type'] = 't-bitbar-gw-batt-p2'
             else:
                 test['worker-type'] = 't-bitbar-gw-perf-p2'
         elif test_platform.startswith('android-em-7.0-x86'):
             test['worker-type'] = 'terraform-packet/gecko-t-linux'
         elif test_platform.startswith('linux') or test_platform.startswith('android'):
             if test.get('suite', '') in ['talos', 'raptor'] and \
                  not test['build-platform'].startswith('linux64-ccov'):
-                test['worker-type'] = 'releng-hardware/gecko-t-linux-talos'
+                test['worker-type'] = 't-linux-talos'
             else:
                 test['worker-type'] = LINUX_WORKER_TYPES[test['instance-size']]
         else:
             raise Exception("unknown test_platform {}".format(test_platform))
 
         yield test