diff --git a/taskcluster/fenix_taskgraph/transforms/beetmover.py b/taskcluster/fenix_taskgraph/transforms/beetmover.py
index 20a694b72c..3044d22d34 100644
--- a/taskcluster/fenix_taskgraph/transforms/beetmover.py
+++ b/taskcluster/fenix_taskgraph/transforms/beetmover.py
@@ -52,11 +52,13 @@ def make_task_description(config, tasks):
 
         # Switch between nightly and release scope
         # Note: if dep bucket is wanted, *temporarily* switch it to "~:dep"
-        if task['build-type']['nightly']:
+        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"
-        
+
         task = {
             "label": label,
             "description": description,
diff --git a/taskcluster/fenix_taskgraph/util/scriptworker.py b/taskcluster/fenix_taskgraph/util/scriptworker.py
index f497c83bef..e4bdfa7c2c 100644
--- a/taskcluster/fenix_taskgraph/util/scriptworker.py
+++ b/taskcluster/fenix_taskgraph/util/scriptworker.py
@@ -274,6 +274,7 @@ def generate_beetmover_artifact_map(config, job, **kwargs):
         
         if job["attributes"]["build-type"] == "nightly":
             folder_prefix = upload_date.strftime("%Y/%m/%Y-%m-%d-%H-%M-%S-")
+            # TODO: Remove this when version.txt has versioning fixed
             version = version.split('-')[0]
         else:
             folder_prefix = f"{version}/android/"