--- a/taskcluster/ci/docker-image/image.yml
+++ b/taskcluster/ci/docker-image/image.yml
@@ -7,17 +7,17 @@ task:
   metadata:
     name: 'Docker Image Build: {{image_name}}'
     description: 'Build the docker image {{image_name}} for use by dependent tasks'
     source: '{{source}}'
     owner: mozilla-taskcluster-maintenance@mozilla.com
   tags:
     createdForUser: '{{owner}}'
 
-  workerType: taskcluster-images
+  workerType: gecko-images
   provisionerId: aws-provisioner-v1
   schedulerId: task-graph-scheduler
 
   routes:
       # Indexing routes to avoid building the same image twice
       - index.{{index_image_prefix}}.level-{{level}}.{{image_name}}.latest
       - index.{{index_image_prefix}}.level-{{level}}.{{image_name}}.pushdate.{{year}}.{{month}}-{{day}}-{{pushtime}}
       - index.{{index_image_prefix}}.level-{{level}}.{{image_name}}.hash.{{context_hash}}

--- a/taskcluster/ci/upload-symbols/job-template.yml
+++ b/taskcluster/ci/upload-symbols/job-template.yml
@@ -1,16 +1,16 @@
 label: # see transforms
 description: Upload Symbols
 dependencies: # see transforms
 expires-after: 7 days
 deadline-after: 24 hours
 run-on-projects:
     - try
-worker-type: aws-provisioner-v1/symbol-upload
+worker-type: aws-provisioner-v1/gecko-symbol-upload
 worker:
     implementation: docker-worker
     max-run-time: 600
     command: ["/bin/bash", "bin/upload.sh"]
     docker-image: taskclusterprivate/upload_symbols:0.0.4
     env:
         GECKO_HEAD_REPOSITORY: # see transforms
         GECKO_HEAD_REV: # see transforms