--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2632,18 +2632,21 @@ BRANCHES['mozilla-beta']['stage_product'
     'fennec': 'mobile'
 }
 # used by releasetasks
 BRANCHES['mozilla-beta']['bouncer_enabled'] = True,
 BRANCHES['mozilla-beta']['postrelease_version_bump_enabled'] = True,
 BRANCHES['mozilla-beta']['push_to_candidates_enabled'] = True,
 BRANCHES['mozilla-beta']['push_to_releases_automatic'] = True,
 BRANCHES['mozilla-beta']['release_channels'] = ("beta",)
-# TODO - change beetmover_candidates_bucket to support multiple buckets as fennec will need its own
-BRANCHES['mozilla-beta']['beetmover_candidates_bucket'] = "net-mozaws-prod-delivery-firefox"
+BRANCHES['mozilla-beta']['beetmover_buckets'] = {
+    "firefox": "net-mozaws-prod-delivery-firefox",
+    # TODO - add fennec support
+    # 'fennec': 'net-mozaws-prod-delivery-archive',
+}
 BRANCHES['mozilla-beta']['release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
 BRANCHES['mozilla-beta']['l10n_release_platforms'] = ("linux", "linux64", "win32", "win64", "macosx64")
 ###
 
 ######## mozilla-aurora
 BRANCHES['mozilla-aurora']['repo_path'] = 'releases/mozilla-aurora'
 BRANCHES['mozilla-aurora']['l10n_repo_path'] = 'releases/l10n/mozilla-aurora'
 BRANCHES['mozilla-aurora']['enable_perproduct_builds'] = True