--- a/taskcluster/ci/marionette-harness/kind.yml
+++ b/taskcluster/ci/marionette-harness/kind.yml
@@ -19,17 +19,17 @@ jobs:
         attributes:
             build_platform: marionette-harness
             build_type: opt
         treeherder:
             platform: linux64/opt
             kind: test
             tier: 2
             symbol: tc(Mn-h)
-        worker-type: aws-provisioner-v1/desktop-test-xlarge
+        worker-type: aws-provisioner-v1/gecko-t-xlarge
         worker:
             implementation: docker-worker
             docker-image: {in-tree: desktop-build}  # NOTE: better to use the lint image
             env:
                 JOB_SCRIPT: "taskcluster/scripts/tester/harness-test-linux.sh"
                 MOZHARNESS_SCRIPT: "testing/mozharness/scripts/marionette_harness_tests.py"
                 TOOLS_DISABLE: "true"
                 TOOLTOOL_REPO: "https://github.com/mozilla/build-tooltool"

--- a/taskcluster/taskgraph/transforms/tests/make_task_description.py
+++ b/taskcluster/taskgraph/transforms/tests/make_task_description.py
@@ -25,20 +25,20 @@ from taskgraph.transforms.job.common imp
 )
 
 import logging
 import os.path
 
 ARTIFACT_URL = 'https://queue.taskcluster.net/v1/task/{}/artifacts/{}'
 WORKER_TYPE = {
     # default worker types keyed by instance-size
-    'large': 'aws-provisioner-v1/desktop-test-large',
-    'xlarge': 'aws-provisioner-v1/desktop-test-xlarge',
-    'legacy': 'aws-provisioner-v1/desktop-test',
-    'default': 'aws-provisioner-v1/desktop-test-large',
+    'large': 'aws-provisioner-v1/gecko-t-large',
+    'xlarge': 'aws-provisioner-v1/gecko-t-xlarge',
+    'legacy': 'aws-provisioner-v1/gecko-t-test',
+    'default': 'aws-provisioner-v1/gecko-t-large',
     # windows worker types keyed by test-platform
     'windows7-32-vm': 'aws-provisioner-v1/gecko-t-win7-32',
     'windows7-32': 'aws-provisioner-v1/gecko-t-win7-32-gpu',
     'windows10-64-vm': 'aws-provisioner-v1/gecko-t-win10-64',
     'windows10-64': 'aws-provisioner-v1/gecko-t-win10-64-gpu'
 }
 
 ARTIFACTS = [