diff --git a/.taskcluster.yml b/.taskcluster.yml
index e803a2845..f1fd7be3e 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -122,7 +122,7 @@ tasks:
                                 name: "Decision Task for cron job ${cron.job_name}"
                                 description: 'Created by a [cron task](https://firefox-ci-tc.services.mozilla.com/tasks/${cron.task_id})'
                 provisionerId: "${trustDomain}-${level}"
-                workerType: "decision"
+                workerType: "decision-gcp"
                 tags:
                     $if: 'tasks_for in ["github-push", "github-pull-request"]'
                     then:
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 7ee596bbe..e85935549 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -40,17 +40,17 @@ workers:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: b-linux
+            worker-type: b-linux-gcp
         b-android-large:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: b-linux-large
+            worker-type: b-linux-large-gcp
         b-android-xlarge:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: b-linux-xlarge
+            worker-type: b-linux-xlarge-gcp
         beetmover:
             provisioner: scriptworker-k8s
             implementation: scriptworker-beetmover
@@ -71,13 +71,13 @@ workers:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: 'images'
+            worker-type: 'images-gcp'
         # misc is used by taskgraph to generate tasks with more than 10 routes
         misc:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
             os: linux
-            worker-type: 'b-linux'
+            worker-type: 'b-linux-gcp'
         push-apk:
             provisioner: scriptworker-k8s
             implementation: scriptworker-pushapk