--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -348,16 +348,24 @@ workers:
         mac-signing:
             provisioner: scriptworker-prov-v1
             implementation: scriptworker-iscript
             os: macosx
             worker-type:
                 by-release-level:
                     production: signing-mac-v1
                     staging: depsigning-mac-v1
+        tree:
+            provisioner: scriptworker-k8s
+            implementation: treescript
+            os: scriptworker
+            worker-type:
+                by-release-level:
+                    production: gecko-3-tree
+                    staging: gecko-1-tree
         t-ap.*:
             provisioner: proj-autophone
             implementation: script-engine-autophone
             os: linux
             worker-type: 'gecko-{alias}'
         t-bitbar-gw.*:
             provisioner: proj-autophone
             implementation: generic-worker

--- a/taskcluster/ci/l10n-bump/kind.yml
+++ b/taskcluster/ci/l10n-bump/kind.yml
@@ -5,20 +5,17 @@
 loader: taskgraph.loader.transform:loader
 
 transforms:
     - taskgraph.transforms.release_version_bump:transforms
     - taskgraph.transforms.task:transforms
 
 
 job-defaults:
-    worker-type:
-        by-project:
-            mozilla-(beta|central|esr.*): scriptworker-k8s/gecko-3-tree
-            default: scriptworker-k8s/gecko-1-tree
+    worker-type: tree
     worker:
         implementation: treescript
         tags: []
         bump: false
         dontbuild: true
         ignore-closed-tree: false
         push:
             by-project:

--- a/taskcluster/ci/release-early-tagging/kind.yml
+++ b/taskcluster/ci/release-early-tagging/kind.yml
@@ -8,21 +8,17 @@ transforms:
     - taskgraph.transforms.release_deps:transforms
     - taskgraph.transforms.release_version_bump:transforms
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     description: Release Promotion version tag for buildN
     run-on-projects: []
     shipping-phase: promote
-    worker-type:
-        by-project:
-            mozilla-(beta|release|esr.*): scriptworker-k8s/gecko-3-tree
-            maple: scriptworker-k8s/gecko-3-tree
-            default: scriptworker-k8s/gecko-1-tree
+    worker-type: tree
     worker:
         implementation: treescript
         tags: ['buildN']
         bump: false
         dontbuild: true
         push:
             by-project:
                 mozilla-(beta|release|esr.*): true

--- a/taskcluster/ci/release-version-bump/kind.yml
+++ b/taskcluster/ci/release-version-bump/kind.yml
@@ -11,21 +11,17 @@ transforms:
 
 kind-dependencies:
     - release-beetmover-push-to-release
 
 job-defaults:
     description: Release Promotion version bump/tag
     run-on-projects: []
     shipping-phase: ship
-    worker-type:
-        by-project:
-            mozilla-(beta|release|esr.*): scriptworker-k8s/gecko-3-tree
-            maple: scriptworker-k8s/gecko-3-tree
-            default: scriptworker-k8s/gecko-1-tree
+    worker-type: tree
     worker:
         implementation: treescript
         dontbuild: true
         tags: ['release']
         bump: true
         bump-files:
             by-project:
                 default: ["browser/config/version_display.txt"]

--- a/taskcluster/taskgraph/util/workertypes.py
+++ b/taskcluster/taskgraph/util/workertypes.py
@@ -18,18 +18,16 @@ WORKER_TYPES = {
     'invalid/always-optimized': ('always-optimized', None),
     'scriptworker-k8s/gecko-1-balrog': ('balrog', None),
     'scriptworker-k8s/gecko-3-balrog': ('balrog', None),
     'scriptworker-k8s/gecko-3-beetmover': ('beetmover', None),
     'scriptworker-prov-v1/pushapk-v1': ('push-apk', None),
     "scriptworker-prov-v1/signing-linux-v1": ('scriptworker-signing', None),
     "scriptworker-k8s/gecko-3-shipit": ('shipit', None),
     "scriptworker-k8s/gecko-1-shipit": ('shipit', None),
-    "scriptworker-k8s/gecko-3-tree": ('treescript', None),
-    "scriptworker-k8s/gecko-1-tree": ('treescript', None),
     'terraform-packet/gecko-t-linux': ('docker-worker', 'linux'),
     'releng-hardware/gecko-t-osx-1014': ('generic-worker', 'macosx'),
     'releng-hardware/gecko-t-osx-1014-power': ('generic-worker', 'macosx'),
 }
 
 
 @memoize
 def _get(graph_config, alias, level, release_level):