diff --git a/taskcluster/ci/mark-as-shipped/kind.yml b/taskcluster/ci/mark-as-shipped/kind.yml
index d6d291241..86226ddd5 100644
--- a/taskcluster/ci/mark-as-shipped/kind.yml
+++ b/taskcluster/ci/mark-as-shipped/kind.yml
@@ -24,7 +24,13 @@ job-template:
     description: Mark Fenix as shipped in ship-it
     worker-type: ship-it
     scopes:
-        - project:releng:ship-it:action:mark-as-shipped
+        by-level:
+            '3':
+                - project:releng:ship-it:action:mark-as-shipped
+                - project:releng:ship-it:server:production
+            default:
+                - project:releng:ship-it:action:mark-as-shipped
+                - project:releng:ship-it:server:staging
     worker: {}
 
     treeherder:
diff --git a/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py b/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py
index ac963b915..af44124fe 100644
--- a/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py
+++ b/taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py
@@ -15,6 +15,20 @@ from taskgraph.util.schema import resolve_keyed_by
 transforms = TransformSequence()
 
 
+@transforms.add
+def resolve_keys(config, tasks):
+    for task in tasks:
+        resolve_keyed_by(
+            task,
+            'scopes',
+            item_name=task["name"],
+            **{
+                'level': config.params["level"],
+            }
+        )
+        yield task
+
+
 @transforms.add
 def make_task_description(config, jobs):
     for job in jobs: