diff --git a/.taskcluster.yml b/.taskcluster.yml
index 45473e1b0c..f46cf06eab 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -109,7 +109,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: "app-services-${level}"
-                          workerType: "decision-gcp"
+                          workerType: "decision"
                           tags:
                               $if: 'tasks_for in ["github-push", "github-pull-request", "github-issue-comment"]'
                               then:
diff --git a/taskcluster/config.yml b/taskcluster/config.yml
index 40e856b683..c94a8fddc5 100644
--- a/taskcluster/config.yml
+++ b/taskcluster/config.yml
@@ -18,7 +18,7 @@ workers:
       provisioner: 'app-services-{level}'
       implementation: docker-worker
       os: linux
-      worker-type: 'b-linux-gcp'
+      worker-type: 'b-linux'
     b-osx:
       provisioner: releng-hardware
       implementation: generic-worker
@@ -28,7 +28,7 @@ workers:
       provisioner: 'app-services-{level}'
       implementation: docker-worker
       os: linux
-      worker-type: 'images-gcp'
+      worker-type: 'images'
     signing:
       provisioner: scriptworker-k8s
       implementation: scriptworker-signing