--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2387,22 +2387,22 @@ BRANCHES['mozilla-beta']['partner_repack
 }
 BRANCHES['mozilla-beta']['snap_enabled'] = True
 BRANCHES['mozilla-beta']['update_verify_channel'] = 'beta-cdntest'
 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.revision.{rev}.firefox.linux-opt",
-            "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.linux-opt",
+            "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",
         },
         "linux64": {
-            "signed": "gecko.v2.mozilla-beta.revision.{rev}.firefox.linux64-opt",
-            "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.linux64-opt",
+            "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",
         },
         "macosx64": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.firefox.macosx64-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.macosx64-opt",
         },
         "win32": {
             "signed": "gecko.v2.mozilla-beta.revision.{rev}.firefox.win32-opt",
             "unsigned": "gecko.v2.mozilla-beta.revision.{rev}.firefox.win32-opt",
@@ -2647,16 +2647,40 @@ BRANCHES['mozilla-esr52']['partner_repac
     "firefox": {
         "script_name": "scripts/desktop_partner_repacks.py",
         "extra_args": [
             "--cfg", "partner_repacks/release_mozilla-esr52_desktop.py",
             "--s3cfg", "/builds/partners-s3cfg",
         ],
     },
 }
+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",
+        },
+        "linux64": {
+            "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.linux64-opt",
+            "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.linux64-opt",
+        },
+        "macosx64": {
+            "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.macosx64-opt",
+            "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.macosx64-opt",
+        },
+        "win32": {
+            "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win32-opt",
+            "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win32-opt",
+        },
+        "win64": {
+            "signed": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win64-opt",
+            "unsigned": "gecko.v2.mozilla-esr52.revision.{rev}.firefox.win64-opt",
+        },
+    },
+}
 
 ######## try
 # Try-specific configs
 BRANCHES['try']['l10n_repo_path'] = 'l10n-central'
 BRANCHES['try']['stage_username'] = 'trybld'
 BRANCHES['try']['stage_username_mobile'] = 'trybld'
 BRANCHES['try']['stage_ssh_key'] = 'trybld_dsa'
 BRANCHES['try']['stage_ssh_mobile_key'] = 'trybld_dsa'