--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2157,32 +2157,49 @@ BRANCHES['mozilla-release']['release_cha
 # Bug 1313434, CI builds on all named branches
 BRANCHES['mozilla-release']['watch_all_branches'] = True
 # platform to TC index mapping to help finding prmotable CI builds
 BRANCHES['mozilla-release']['tc_indexes'] = {
     "firefox": {
         "linux": {
             "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
             "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.linux-opt.en-US",
+            "ci_system": "tc",
         },
         "linux64": {
             "signed": "gecko.v2.mozilla-release.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
             "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.linux64-opt.en-US",
+            "ci_system": "tc",
         },
         "macosx64": {
             "signed": "gecko.v2.mozilla-release.revision.{rev}.firefox.macosx64-opt",
             "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox.macosx64-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "ci_system": "tc",
+            # "repacakge": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.macosx64-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.macosx64-nightly-repackage-signing.en-US",
         },
         "win32": {
             "signed": "gecko.v2.mozilla-release.revision.{rev}.firefox.win32-opt",
             "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox.win32-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "ci_system": "tc",
+            # "repacakge": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win32-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
         },
         "win64": {
             "signed": "gecko.v2.mozilla-release.revision.{rev}.firefox.win64-opt",
             "unsigned": "gecko.v2.mozilla-release.revision.{rev}.firefox.win64-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "ci_system": "tc",
+            # "repacakge": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win64-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
         },
     },
     # TODO: fennec
 }
 
 ######## mozilla-beta
 BRANCHES['mozilla-beta']['repo_path'] = 'releases/mozilla-beta'
 BRANCHES['mozilla-beta']['l10n_repo_path'] = 'releases/l10n/mozilla-beta'
@@ -2354,54 +2371,88 @@ BRANCHES['mozilla-beta']['update_verify_
 }
 BRANCHES['mozilla-beta']['update_verify_requires_cdn_push'] = True
 # platform to TC index mapping to help finding prmotable CI builds
 BRANCHES['mozilla-beta']['tc_indexes'] = {
     "firefox": {
         "linux": {
             "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.linux-opt.en-US",
+            "ci_system": "tc",
         },
         "linux64": {
             "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.linux64-opt.en-US",
+            "ci_system": "tc",
         },
         "macosx64": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.firefox.macosx64-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.macosx64-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "repacakge": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.macosx64-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.macosx64-nightly-repackage-signing.en-US",
+            # "ci_system": "tc",
         },
         "win32": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.firefox.win32-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.win32-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "repacakge": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win32-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
+            # "ci_system": "tc",
         },
         "win64": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.firefox.win64-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.win64-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "repacakge": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win64-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-beta.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
+            # "ci_system": "tc",
         },
     },
     "devedition": {
         "linux": {
             "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.linux-opt.en-US",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.linux-opt.en-US",
+            "ci_system": "tc",
         },
         "linux64": {
             "signed": "gecko.v2.mozilla-beta.signed-nightly.revision.{rev}.devedition-l10n.linux64-opt.en-US",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.linux64-opt.en-US",
+            "ci_system": "tc",
         },
         "macosx64": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.devedition.macosx64-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition.macosx64-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "repacakge": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.macosx64-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.macosx64-nightly-repackage-signing.en-US",
+            # "ci_system": "tc",
         },
         "win32": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.devedition.win32-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition.win32-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "repacakge": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.win32-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.win32-nightly-repackage-signing.en-US",
+            # "ci_system": "tc",
         },
         "win64": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.devedition.win64-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.devedition.win64-opt",
+            "ci_system": "bb",
+            # Uncomment when TC is tier-1
+            # "repacakge": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.win64-nightly-repackage.en-US",
+            # "repacakge-signing": "gecko.v2.mozilla-beta.revision.{rev}.devedition-l10n.win64-nightly-repackage-signing.en-US",
+            # "ci_system": "tc",
         },
     },
     # TODO: fennec
 }
 
 ######## mozilla-esr52
 BRANCHES['mozilla-esr52']['repo_path'] = 'releases/mozilla-esr52'
 BRANCHES['mozilla-esr52']['update_channel'] = 'esr'
@@ -2503,32 +2554,37 @@ BRANCHES['mozilla-esr52']['partner_repac
         ],
     },
 }
 BRANCHES['mozilla-esr52']['tc_indexes'] = {
     "firefox": {
         "linux": {
             "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.linux-opt",
             "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.linux-opt",
+            "ci_system": "bb",
         },
         "linux64": {
             "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.linux64-opt",
             "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.linux64-opt",
+            "ci_system": "bb",
         },
         "macosx64": {
             "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.macosx64-opt",
             "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.macosx64-opt",
+            "ci_system": "bb",
         },
         "win32": {
             "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win32-opt",
             "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win32-opt",
+            "ci_system": "bb",
         },
         "win64": {
             "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win64-opt",
             "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win64-opt",
+            "ci_system": "bb",
         },
     },
 }
 
 ######## try
 # Try-specific configs
 BRANCHES['try']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['try']['stage_username'] = 'trybld'

--- a/mozilla/project_branches.py
+++ b/mozilla/project_branches.py
@@ -276,54 +276,70 @@ PROJECT_BRANCHES = {
             'firefox': 'beta-dev-cdntest',
             'devedition': 'aurora-dev-cdntest',
         },
         'tc_indexes': {
             "firefox": {
                 "linux": {
                     "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.linux-opt.en-US",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.firefox-l10n.linux-opt.en-US",
+                    "ci_system": "tc",
                 },
                 "linux64": {
                     "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.firefox-l10n.linux64-opt.en-US",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.firefox-l10n.linux64-opt.en-US",
+                    "ci_system": "tc",
                 },
                 "macosx64": {
                     "signed": "gecko.v2.jamun.revision.{rev}.firefox.macosx64-opt",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.firefox.macosx64-opt",
+                    "repacakge": "gecko.v2.jamun.revision.{rev}.firefox-l10n.macosx64-nightly-repackage.en-US",
+                    "repacakge-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.macosx64-nightly-repackage-signing.en-US",
+                    "ci_system": "tc",
                 },
                 "win32": {
                     "signed": "gecko.v2.jamun.revision.{rev}.firefox.win32-opt",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.firefox.win32-opt",
+                    "repacakge": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win32-nightly-repackage.en-US",
+                    "repacakge-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win32-nightly-repackage-signing.en-US",
+                    "ci_system": "tc",
                 },
                 "win64": {
                     "signed": "gecko.v2.jamun.revision.{rev}.firefox.win64-opt",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.firefox.win64-opt",
+                    "repacakge": "gecko.v2.mozilla-release.revision.{rev}.firefox-l10n.win64-nightly-repackage.en-US",
+                    "repacakge-signing": "gecko.v2.jamun.revision.{rev}.firefox-l10n.win64-nightly-repackage-signing.en-US",
+                    "ci_system": "tc",
                 },
             },
             "devedition": {
                 "linux": {
                     "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.linux-opt.en-US",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.devedition-l10n.linux-opt.en-US",
+                    "ci_system": "tc",
                 },
                 "linux64": {
                     "signed": "gecko.v2.jamun.signed-nightly.revision.{rev}.devedition-l10n.linux64-opt.en-US",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.devedition-l10n.linux64-opt.en-US",
+                    "ci_system": "tc",
                 },
                 "macosx64": {
                     "signed": "gecko.v2.jamun.revision.{rev}.devedition.macosx64-opt",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.devedition.macosx64-opt",
+                    "ci_system": "tc",
                 },
                 "win32": {
                     "signed": "gecko.v2.jamun.revision.{rev}.devedition.win32-opt",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.devedition.win32-opt",
+                    "ci_system": "tc",
                 },
                 "win64": {
                     "signed": "gecko.v2.jamun.revision.{rev}.devedition.win64-opt",
                     "unsigned": "gecko.v2.jamun.revision.{rev}.devedition.win64-opt",
+                    "ci_system": "tc",
                 },
             },
             # TODO: fennec
         },
     },
     'larch': {
         'lock_platforms': True,
         'pgo_strategy': 'per-checkin',