diff --git a/taskcluster/config.yml b/taskcluster/config.yml
index 73543737d..5dc16904a 100644
--- a/taskcluster/config.yml
+++ b/taskcluster/config.yml
@@ -30,7 +30,7 @@ workers:
             provisioner: scriptworker-k8s
             implementation: scriptworker-signing
             os: scriptworker
-            worker-type: mobile-t-signing
+            worker-type: mobile-t-signing-dev
         images:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
@@ -53,7 +53,7 @@ workers:
             worker-type:
                 by-level:
                     "3": mobile-3-signing
-                    default: mobile-t-signing
+                    default: mobile-t-signing-dev
         t-bitbar.*:
             provisioner: proj-autophone
             implementation: generic-worker
diff --git a/taskcluster/rb_taskgraph/transforms/signing_apks.py b/taskcluster/rb_taskgraph/transforms/signing_apks.py
index a734d2f78..1575032ad 100644
--- a/taskcluster/rb_taskgraph/transforms/signing_apks.py
+++ b/taskcluster/rb_taskgraph/transforms/signing_apks.py
@@ -22,7 +22,7 @@ def build_signing_task(config, tasks):
                 "taskId": {"task-reference": "<build>"},
                 "taskType": "build",
                 "paths": list(dep.attributes["apks"].values()),
-                "formats": ["autograph_apk"],
+                "formats": ["gcp_prod_autograph_apk"],
             }
         ]
         del task["primary-dependency"]
diff --git a/taskcluster/rb_taskgraph/transforms/signing_bundle.py b/taskcluster/rb_taskgraph/transforms/signing_bundle.py
index 27deeed88..d302209da 100644
--- a/taskcluster/rb_taskgraph/transforms/signing_bundle.py
+++ b/taskcluster/rb_taskgraph/transforms/signing_bundle.py
@@ -22,7 +22,7 @@ def build_signing_task(config, tasks):
             "taskId": {"task-reference": "<build-bundle>"},
             "taskType": "build",
             "paths": [dep.attributes["aab"]],
-            "formats": ["autograph_aab"],
+            "formats": ["gcp_prod_autograph_aab"],
         }]
         del task["primary-dependency"]
         yield task