--- a/mozilla/preproduction_config.py
+++ b/mozilla/preproduction_config.py
@@ -31,17 +31,17 @@ GLOBAL_VARS = {
     'xulrunner_tinderbox_tree': 'MozillaTest',
     'weekly_tinderbox_tree': 'MozillaTest',
     'l10n_tinderbox_tree': 'MozillaStaging',
     'packaged_unittest_tinderbox_tree': 'MozillaTest',
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',
     'hg_username': 'stage-ffxbld',
     'base_bundle_urls': ['http://preproduction-master.srv.releng.scl3.mozilla.com/pub/mozilla.org/firefox/bundles'],
-    'tooltool_url_list': ['http://runtime-binaries.pvt.build.mozilla.org/tooltool'],
+    'tooltool_url_list': ['http://tooltool.pvt.build.mozilla.org/build'],
 }
 
 BUILDS_BEFORE_REBOOT = 1
 SYMBOL_SERVER_HOST = 'preproduction-stage.srv.releng.scl3.mozilla.com'
 
 # Local branch overrides
 BRANCHES = {
     'mozilla-central': {

--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -80,17 +80,17 @@ GLOBAL_VARS = {
     # and sendchange retry count before give up
     'unittest_masters': [
         ('buildbot-master81.build.mozilla.org:9301', True, 5),
     ],
     'xulrunner_tinderbox_tree': 'XULRunner',
     'weekly_tinderbox_tree': 'Testing',
     'l10n_tinderbox_tree': 'Mozilla-l10n',
     'base_bundle_urls': ['https://ftp-ssl.mozilla.org/pub/mozilla.org/firefox/bundles'],
-    'tooltool_url_list': ['http://runtime-binaries.pvt.build.mozilla.org/tooltool'],
+    'tooltool_url_list': ['http://tooltool.pvt.build.mozilla.org/build'],
     'blob_upload': True,
     'mozharness_configs': {
         'balrog': 'balrog/production.py',
     },
 }
 
 BUILDS_BEFORE_REBOOT = 1
 SYMBOL_SERVER_HOST = 'symbolpush.mozilla.org'

--- a/mozilla/staging_config.py
+++ b/mozilla/staging_config.py
@@ -45,17 +45,17 @@ GLOBAL_VARS = {
     'xulrunner_tinderbox_tree': 'MozillaTest',
     'weekly_tinderbox_tree': 'MozillaTest',
     'l10n_tinderbox_tree': 'MozillaStaging',
     'packaged_unittest_tinderbox_tree': 'MozillaTest',
     'tinderbox_tree': 'MozillaTest',
     'mobile_tinderbox_tree': 'MobileTest',
     'hg_username': 'stage-ffxbld',
     'base_bundle_urls': ['http://dev-stage01.build.mozilla.org/pub/mozilla.org/firefox/bundles'],
-    'tooltool_url_list': ['http://runtime-binaries.pvt.build.mozilla.org/tooltool'],
+    'tooltool_url_list': ['http://tooltool.pvt.build.mozilla.org/build'],
     'blob_upload': True,
     'mozharness_configs': {
         'balrog': 'balrog/staging.py',
     },
 }
 
 BUILDS_BEFORE_REBOOT = 5
 SYMBOL_SERVER_HOST = 'dev-stage01.srv.releng.scl3.mozilla.com'