diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 9b0e581b0..ba44d86a2 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -55,7 +55,8 @@ workers:
             provisioner: scriptworker-k8s
             implementation: scriptworker-beetmover
             os: scriptworker
-            worker-type: 'mobile-1-beetmover-dev'
+            # Note: if dep bucket is wanted, *temporarily* switch to 'mobile-1-beetmover-dev'
+            worker-type: 'mobile-{level}-beetmover'
         dep-signing:
             provisioner: scriptworker-k8s
             implementation: scriptworker-signing
diff --git a/taskcluster/fenix_taskgraph/transforms/beetmover.py b/taskcluster/fenix_taskgraph/transforms/beetmover.py
index 03e525501..20a694b72 100644
--- a/taskcluster/fenix_taskgraph/transforms/beetmover.py
+++ b/taskcluster/fenix_taskgraph/transforms/beetmover.py
@@ -50,14 +50,20 @@ def make_task_description(config, tasks):
         if task.get("locale"):
             attributes["locale"] = task["locale"]
 
+        # Switch between nightly and release scope
+        # Note: if dep bucket is wanted, *temporarily* switch it to "~:dep"
+        if task['build-type']['nightly']:
+            bucket_scope = "project:mobile:fenix:releng:beetmover:bucket:nightly"
+        else:
+            bucket_scope = "project:mobile:fenix:releng:beetmover:bucket:release"
+        
         task = {
             "label": label,
             "description": description,
             "worker-type": "beetmover",
             "worker": task["worker"],
             "scopes": [
-                # TODO: Adjust scope
-                "project:mobile:fenix:releng:beetmover:bucket:dep",
+                bucket_scope,
                 "project:mobile:fenix:releng:beetmover:action:direct-push-to-bucket",
             ],
             "dependencies": task["dependencies"],