diff --git a/testing/mozharness/configs/builds/releng_base_android_64_builds.py b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
index 646877f0148..859a1d1c8ad 100644
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -55,6 +55,7 @@ config = {
     'platform': 'android',
     'stage_platform': 'android',
     'stage_product': 'mobile',
+    'publish_nightly_en_US_routes': True,
     'post_upload_include_platform': True,
     'enable_max_vsize': False,
     'use_package_as_marfile': True,
diff --git a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
index bbcea67f941..8ad885f2e29 100644
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -62,6 +62,7 @@ config = {
     'base_name': 'Linux_%(branch)s',
     'platform': 'linux',
     'stage_platform': 'linux',
+    'publish_nightly_en_US_routes': True,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
diff --git a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
index 44769242698..e4b4fd67a4d 100644
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -62,6 +62,7 @@ config = {
     'base_name': 'Linux_x86-64_%(branch)s',
     'platform': 'linux64',
     'stage_platform': 'linux64',
+    'publish_nightly_en_US_routes': True,
     'use_platform_in_symbols_extra_buildid': True,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
diff --git a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
index 0688e40c485..b9bcc927a48 100644
--- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
@@ -46,6 +46,7 @@ config = {
     'base_name': 'OS X 10.7 %(branch)s',
     'platform': 'macosx64',
     'stage_platform': 'macosx64',
+    'publish_nightly_en_US_routes': True,
     'use_platform_in_symbols_extra_buildid': True,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
diff --git a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
index 8114ac5da8b..9cd1af41995 100644
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -74,6 +74,7 @@ config = {
     'base_name': 'WINNT_5.2_%(branch)s',
     'platform': 'win32',
     'stage_platform': 'win32',
+    'publish_nightly_en_US_routes': True,
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
diff --git a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
index a3ce004b4a1..529de53fac0 100644
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -74,6 +74,7 @@ config = {
     'base_name': 'WINNT_6.1_x86-64_%(branch)s',
     'platform': 'win64',
     'stage_platform': 'win64',
+    'publish_nightly_en_US_routes': True,
     'env': {
         'MOZ_SYMBOLS_EXTRA_BUILDID': 'win64',
         'MOZ_AUTOMATION': '1',
diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11.py
index 7669263aef6..ef990a4bca7 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11.py
@@ -1,6 +1,7 @@
 config = {
     'base_name': 'Android armv7 API 11+ %(branch)s',
     'stage_platform': 'android-api-11',
+    'build_type': 'api-11-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-11/nightly',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_debug.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_debug.py
index e3c23700bcd..c7d3ba0e08b 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_debug.py
@@ -1,6 +1,7 @@
 config = {
     'base_name': 'Android armv7 API 11+ %(branch)s debug',
     'stage_platform': 'android-api-11-debug',
+    'build_type': 'api-11-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-11/debug',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9.py
index 903c1f80e21..f8f542ae820 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9.py
@@ -1,6 +1,7 @@
 config = {
     'base_name': 'Android armv7 API 9 %(branch)s',
     'stage_platform': 'android-api-9',
+    'build_type': 'api-9-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9_debug.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9_debug.py
index 671369684da..b3fa11f76d4 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_9_debug.py
@@ -1,6 +1,7 @@
 config = {
     'base_name': 'Android armv7 API 9 %(branch)s debug',
     'stage_platform': 'android-api-9-debug',
+    'build_type': 'api-9-debug',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-9-10-constrained/debug',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android/releng.manifest',
     'multi_locale_config_platform': 'android',
diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
index 78c40d0fd37..288f0d65d94 100644
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
@@ -1,6 +1,8 @@
 config = {
     'base_name': 'Android 4.2 x86 %(branch)s',
     'stage_platform': 'android-x86',
+    'publish_nightly_en_US_routes': False,
+    'build_type': 'x86-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/nightly',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-x86/releng.manifest',
 }
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
index 94564d8edde..0b3c543eabe 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
@@ -16,6 +16,8 @@ config = {
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
+    'publish_nightly_en_US_routes': False,
+    'build_type': 'asan',
     'purge_minsize': 12,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
 asan.manifest",
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
index 55a181af5b5..33e3082b8e5 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
@@ -16,6 +16,8 @@ config = {
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
+    'publish_nightly_en_US_routes': False,
+    'build_type': 'asan-debug',
     'debug_build': True,
     'purge_minsize': 12,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_mulet.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_mulet.py
index 67ed522450b..e1afca859b5 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_mulet.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_mulet.py
@@ -11,6 +11,7 @@ config = {
         'sendchange',
     ],
     'stage_platform': 'linux64-mulet',
+    'build_type': 'mulet-opt',
     'stage_product': 'b2g',
     'tooltool_manifest_src': "b2g/dev/config/tooltool-manifests/linux64/releng.manifest",
     'platform_supports_post_upload_to_latest': False,
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
index 69cd74ea6e1..94032575e15 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@@ -17,6 +17,7 @@ config = {
     ],
     'debug_build': True,
     'stage_platform': 'linux64-st-an-debug',
+    'build_type': 'st-an-debug',
     'purge_minsize': 12,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
 clang.manifest",
diff --git a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_mulet.py b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_mulet.py
index f94966659f9..49a7fbbc12e 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_mulet.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_mulet.py
@@ -10,6 +10,8 @@ config = {
         'sendchange',
     ],
     'stage_platform': 'macosx64-mulet',
+    'publish_nightly_en_US_routes': False,
+    'build_type': 'mulet-opt',
     'stage_product': 'b2g',
     'tooltool_manifest_src': "b2g/dev/config/tooltool-manifests/macosx64/releng.manifest",
     'objdir': 'obj-firefox',
diff --git a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
index 7fa34d567aa..6ccf39f213f 100644
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
@@ -17,6 +17,7 @@ config = {
     ],
     'debug_build': True,
     'stage_platform': 'macosx64-st-an-debug',
+    'build_type': 'st-an-debug',
     'purge_minsize': 12,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/macosx64/\
 clang.manifest",
@@ -44,7 +45,6 @@ clang.manifest",
         'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
                 '/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
     },
-    'src_mozconfig': 'browser/config/mozconfigs/macosx64/\
-debug-static-analysis',
+    'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug-static-analysis',
     #######################
 }
diff --git a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mulet.py b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mulet.py
index 0b399b17680..9340d712a3e 100644
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mulet.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mulet.py
@@ -10,6 +10,8 @@ config = {
         'sendchange',
     ],
     'stage_platform': 'win32-mulet',
+    'publish_nightly_en_US_routes': False,
+    'build_type': 'mulet-opt',
     'stage_product': 'b2g',
     'tooltool_manifest_src': "b2g/dev/config/tooltool-manifests/win32/releng.manifest",
     'enable_signing': False,
diff --git a/testing/mozharness/configs/hazards/common.py b/testing/mozharness/configs/hazards/common.py
index aa6ad65cde4..f47dc425e56 100644
--- a/testing/mozharness/configs/hazards/common.py
+++ b/testing/mozharness/configs/hazards/common.py
@@ -4,6 +4,8 @@ PYTHON_DIR = "/tools/python27"
 SRCDIR = "source"
 
 config = {
+    "platform": "linux64",
+    "build_type": "br-haz",
     "log_name": "hazards",
     "shell-objdir": "obj-opt-js",
     "analysis-dir": "analysis",
diff --git a/testing/mozharness/configs/single_locale/linux.py b/testing/mozharness/configs/single_locale/linux.py
index 1c278b46ffe..5df2dcbfafe 100644
--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -2,6 +2,7 @@ import os
 
 config = {
     "platform": "linux",
+    "stage_product": "firefox",
     "update_platform": "Linux_x86-gcc3",
     "mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig",
     "bootstrap_env": {
diff --git a/testing/mozharness/configs/single_locale/linux64.py b/testing/mozharness/configs/single_locale/linux64.py
index 5f263c1767e..48ddad1473f 100644
--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -2,6 +2,7 @@ import os
 
 config = {
     "platform": "linux64",
+    "stage_product": "firefox",
     "update_platform": "Linux_x86_64-gcc3",
     "mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig",
     "bootstrap_env": {
diff --git a/testing/mozharness/configs/single_locale/macosx64.py b/testing/mozharness/configs/single_locale/macosx64.py
index c9a9828baad..ebbb1f02740 100644
--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -3,6 +3,7 @@ import os
 config = {
     # mozconfig file to use, it depends on branch and platform names
     "platform": "macosx64",
+    "stage_product": "firefox",
     "update_platform": "Darwin_x86_64-gcc3",
     "mozconfig": "%(branch)s/browser/config/mozconfigs/macosx-universal/l10n-mozconfig",
     "bootstrap_env": {
diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-11.py b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-11.py
index 15b075d1658..333f135a5fa 100644
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-11.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-11.py
@@ -10,6 +10,7 @@ STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
+    "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
@@ -73,6 +74,9 @@ config = {
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-11/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+    "stage_product": "mobile",
+    "platform": "android",
+    "build_type": "api-11-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-9.py b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-9.py
index 2e47aa4759a..8be2d02b381 100644
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-9.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-9.py
@@ -10,6 +10,7 @@ STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
+    "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
@@ -73,6 +74,9 @@ config = {
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+    "stage_product": "mobile",
+    "platform": "android",
+    "build_type": "api-9-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
diff --git a/testing/mozharness/configs/single_locale/mozilla-aurora_android.py b/testing/mozharness/configs/single_locale/mozilla-aurora_android.py
index 6c54784a9d3..2c23c23f349 100644
--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android.py
@@ -10,6 +10,7 @@ STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
+    "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
@@ -73,6 +74,8 @@ config = {
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+    "stage_product": "mobile",
+    "platform": "android",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android-api-11.py b/testing/mozharness/configs/single_locale/mozilla-central_android-api-11.py
index 56d77fa2611..ea3bba2a675 100644
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-11.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-11.py
@@ -10,6 +10,7 @@ STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
+    "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
@@ -73,6 +74,9 @@ config = {
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-11/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+    "stage_product": "mobile",
+    "platform": "android",
+    "build_type": "api-11-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android-api-9.py b/testing/mozharness/configs/single_locale/mozilla-central_android-api-9.py
index b010adb090a..91586b78575 100644
--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-9.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-9.py
@@ -10,6 +10,7 @@ STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
+    "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
@@ -73,6 +74,9 @@ config = {
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+    "stage_product": "mobile",
+    "platform": "android",
+    "build_type": "api-9-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
diff --git a/testing/mozharness/configs/single_locale/mozilla-central_android.py b/testing/mozharness/configs/single_locale/mozilla-central_android.py
index 1b68daa3137..72763b0c011 100644
--- a/testing/mozharness/configs/single_locale/mozilla-central_android.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android.py
@@ -10,6 +10,7 @@ STAGE_SSH_KEY = "~/.ssh/ffxbld_rsa"
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
 config = {
+    "branch": BRANCH,
     "log_name": "single_locale",
     "objdir": OBJDIR,
     "is_automation": True,
@@ -73,6 +74,8 @@ config = {
     "mozilla_dir": MOZILLA_DIR,
     "mozconfig": "%s/mobile/android/config/mozconfigs/android/l10n-nightly" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
+    "stage_product": "mobile",
+    "platform": "android",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
diff --git a/testing/mozharness/configs/single_locale/win32.py b/testing/mozharness/configs/single_locale/win32.py
index 5d36670a92e..abd7e147096 100644
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -3,6 +3,7 @@ import sys
 
 config = {
     "platform": "win32",
+    "stage_product": "firefox",
     "update_platform": "WINNT_x86-msvc",
     "mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig",
     "bootstrap_env": {
diff --git a/testing/mozharness/configs/single_locale/win64.py b/testing/mozharness/configs/single_locale/win64.py
index 36d4bc4b3e1..1bfaf355984 100644
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -3,6 +3,7 @@ import sys
 
 config = {
     "platform": "win64",
+    "stage_product": "firefox",
     "update_platform": "WINNT_x86_64-msvc",
     "mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig",
     "bootstrap_env": {
diff --git a/testing/mozharness/scripts/spidermonkey_build.py b/testing/mozharness/scripts/spidermonkey_build.py
index 8cc31b43985..b05f45aea18 100755
--- a/testing/mozharness/scripts/spidermonkey_build.py
+++ b/testing/mozharness/scripts/spidermonkey_build.py
@@ -129,6 +129,7 @@ class SpidermonkeyBuild(MockMixin,
                                 'upload_remote_basepath': None,
                                 'enable_try_uploads': True,
                                 'source': None,
+                                'stage_product': 'firefox',
                             },
         )