diff --git a/taskcluster/ci/beetmover/kind.yml b/taskcluster/ci/beetmover/kind.yml
index 59034397c..ac770898a 100644
--- a/taskcluster/ci/beetmover/kind.yml
+++ b/taskcluster/ci/beetmover/kind.yml
@@ -26,3 +26,11 @@ job-template:
         artifact_map: taskcluster/fenix_taskgraph/manifests/fenix_candidates.yml
     treeherder:
         job-symbol: BM
+    bucket-scope:
+        by-level:
+            '3':
+                by-build-type:
+                    'nightly': "project:mobile:fenix:releng:beetmover:bucket:nightly"
+                    (release|beta): "project:mobile:fenix:releng:beetmover:bucket:release"
+                    default: "project:mobile:fenix:releng:beetmover:bucket:dep"
+            default: "project:mobile:fenix:releng:beetmover:bucket:dep"
diff --git a/taskcluster/fenix_taskgraph/transforms/beetmover.py b/taskcluster/fenix_taskgraph/transforms/beetmover.py
index 3044d22d3..ccbb9d510 100644
--- a/taskcluster/fenix_taskgraph/transforms/beetmover.py
+++ b/taskcluster/fenix_taskgraph/transforms/beetmover.py
@@ -10,6 +10,7 @@ import logging
 
 from six import text_type, ensure_text
 
+from taskgraph.util.schema import optionally_keyed_by, resolve_keyed_by
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.transforms.task import task_description_schema
 from voluptuous import Any, Optional, Required, Schema
@@ -28,6 +29,7 @@ beetmover_description_schema = Schema(
         Optional("attributes"): task_description_schema["attributes"],
         Optional("dependencies"): task_description_schema["dependencies"],
         Optional("run-on-tasks-for"): [text_type],
+        Optional("bucket-scope"): optionally_keyed_by("level", "build-type", str),
     }
 )
 
@@ -50,14 +52,16 @@ 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 config.params.get('level', 1) < 3:
-            bucket_scope = "project:mobile:fenix:releng:beetmover:bucket:dep"
-        elif task['attributes']['nightly']:
-            bucket_scope = "project:mobile:fenix:releng:beetmover:bucket:nightly"
-        else:
-            bucket_scope = "project:mobile:fenix:releng:beetmover:bucket:release"
+        resolve_keyed_by(
+            task, 
+            "bucket-scope",
+            item_name=task['name'],
+            **{
+                'build-type': task['attributes']['build-type'],
+                'level': config.params["level"]
+            }
+        )
+        bucket_scope = task.pop('bucket-scope')
 
         task = {
             "label": label,