--- a/python/mozboot/bin/bootstrap-msys2.vbs
+++ b/python/mozboot/bin/bootstrap-msys2.vbs
@@ -64,17 +64,17 @@ If Err.Number <> 0 Then
     WScript.Quit 1
 End If
 On Error GoTo 0
 
 ' Install ConEmu
 ' Download installer
 On Error Resume Next
 Download "https://conemu.github.io/install2.ps1", "install2.ps1"
-conemuSettingsURI = "https://api.pub.build.mozilla.org/tooltool/sha512/9aa384ecc8025a974999e913c83064b3b797e05d19806e62ef558c8300e4c3f72967e9464ace59759f76216fc2fc66f338a1e5cdea3b9aa264529487f091d929"
+conemuSettingsURI = "https://tooltool.mozilla-releng.net/sha512/9aa384ecc8025a974999e913c83064b3b797e05d19806e62ef558c8300e4c3f72967e9464ace59759f76216fc2fc66f338a1e5cdea3b9aa264529487f091d929"
 ' Run installer
 errorCode = shell.Run("powershell.exe -NoProfile -ExecutionPolicy Unrestricted set dst '" & conemuPath & "'; set ver 'stable'; set lnk 'Mozilla Development Shell'; set xml '" & conemuSettingsURI & "'; set run $FALSE; .\install2.ps1", 0, true)
 ' Delete ConEmu installer
 fso.DeleteFile("install2.ps1")
 If Err.Number <> 0 Then
     MsgBox("Error downloading and installing ConEmu. Make sure you have internet connection and Powershell installed. If you think this is a bug, please file one in Bugzilla https://bugzilla.mozilla.org/enter_bug.cgi?product=Core&component=Build%20Config")
     WScript.Quit 1
 End If

--- a/testing/mozharness/configs/android/android_hw.py
+++ b/testing/mozharness/configs/android/android_hw.py
@@ -18,13 +18,13 @@ config = {
         'create-virtualenv',
         'verify-device',
         'install',
         'run-tests',
     ],
     # from android_common.py
     "download_tooltool": True,
     "download_minidump_stackwalk": True,
-    "tooltool_servers": ['https://api.pub.build.mozilla.org/tooltool/'],
+    "tooltool_servers": ['https://tooltool.mozilla-releng.net/'],
     # minidump_tooltool_manifest_path is relative to workspace/build/tests/
     "minidump_tooltool_manifest_path": "config/tooltool-manifests/linux64/releng.manifest",
     "xpcshell_extra": "--remoteTestRoot=/data/local/tests",
 }

--- a/testing/mozharness/configs/repackage/win32_partner.py
+++ b/testing/mozharness/configs/repackage/win32_partner.py
@@ -24,13 +24,13 @@ config = {
     "repack_id": os.environ.get("REPACK_ID"),
 
     "download_config": download_config,
 
     "repackage_config": repackage_config,
 
     # ToolTool
     "tooltool_manifest_src": 'browser\\config\\tooltool-manifests\\{}\\releng.manifest'.format(platform),
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }

--- a/testing/mozharness/configs/repackage/win64_partner.py
+++ b/testing/mozharness/configs/repackage/win64_partner.py
@@ -24,13 +24,13 @@ config = {
     "repack_id": os.environ.get("REPACK_ID"),
 
     "download_config": download_config,
 
     "repackage_config": repackage_config,
 
     # ToolTool
     "tooltool_manifest_src": 'browser\\config\\tooltool-manifests\\{}\\releng.manifest'.format(platform),
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }

--- a/tools/lint/eslint/eslint-plugin-mozilla/update.sh
+++ b/tools/lint/eslint/eslint-plugin-mozilla/update.sh
@@ -1,25 +1,25 @@
 #!/bin/sh
 # Script to regenerate the npm packages used for eslint-plugin-mozilla by the builders.
 # Requires
 
 # Force the scripts working directory to be projdir/tools/lint/eslint/eslint-plugin-mozilla.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-echo "To complete this script you will need the following tokens from https://api.pub.build.mozilla.org/tokenauth/"
+echo "To complete this script you will need the following tokens from https://mozilla-releng.net/tokens"
 echo " - tooltool.upload.public"
 echo " - tooltool.download.public"
 echo ""
 read -p "Are these tokens visible at the above URL (y/n)?" choice
 case "$choice" in
   y|Y )
     echo ""
-    echo "1. Go to https://api.pub.build.mozilla.org/"
+    echo "1. Go to https://mozilla-releng.net"
     echo "2. Log in using your Mozilla LDAP account."
     echo "3. Click on \"Tokens.\""
     echo "4. Issue a user token with the permissions tooltool.upload.public and tooltool.download.public."
     echo ""
     echo "When you click issue you will be presented with a long string. Paste the string into a temporary file called ~/.tooltool-token."
     echo ""
     read -rsp $'Press any key to continue...\n' -n 1
     ;;
@@ -44,18 +44,18 @@ rm package-lock.json
 echo "Installing modules for eslint-plugin-mozilla..."
 npm install
 
 echo "Creating eslint-plugin-mozilla.tar.gz..."
 tar cvz -f eslint-plugin-mozilla.tar.gz node_modules
 
 echo "Adding eslint-plugin-mozilla.tar.gz to tooltool..."
 rm -f manifest.tt
-../../../../python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint-plugin-mozilla.tar.gz --url="https://api.pub.build.mozilla.org/tooltool/"
+../../../../python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint-plugin-mozilla.tar.gz --url="https://tooltool.mozilla-releng.net/"
 
 echo "Uploading eslint-plugin-mozilla.tar.gz to tooltool..."
-../../../../python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint/eslint-plugin-mozilla" --url="https://api.pub.build.mozilla.org/tooltool/"
+../../../../python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint/eslint-plugin-mozilla" --url="https://tooltool.mozilla-releng.net/"
 
 echo "Cleaning up..."
 rm eslint-plugin-mozilla.tar.gz
 
 echo ""
 echo "Update complete, please commit and check in your changes."

--- a/tools/lint/eslint/update.sh
+++ b/tools/lint/eslint/update.sh
@@ -1,25 +1,25 @@
 #!/bin/sh
 # Script to regenerate the npm packages used for ESLint by the builders.
 # Requires
 
 # Force the scripts working directory to be projdir/tools/lint/eslint.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-echo "To complete this script you will need the following tokens from https://api.pub.build.mozilla.org/tokenauth/"
+echo "To complete this script you will need the following tokens from https://mozilla-releng.net/tokens"
 echo " - tooltool.upload.public"
 echo " - tooltool.download.public"
 echo ""
 read -p "Are these tokens visible at the above URL (y/n)?" choice
 case "$choice" in
   y|Y )
     echo ""
-    echo "1. Go to https://api.pub.build.mozilla.org/"
+    echo "1. Go to https://mozilla-releng.net"
     echo "2. Log in using your Mozilla LDAP account."
     echo "3. Click on \"Tokens.\""
     echo "4. Issue a user token with the permissions tooltool.upload.public and tooltool.download.public."
     echo ""
     echo "When you click issue you will be presented with a long string. Paste the string into a temporary file called ~/.tooltool-token."
     echo ""
     read -rsp $'Press any key to continue...\n' -n 1
     ;;
@@ -51,20 +51,20 @@ echo "Installing eslint and external plu
 # access to make changes.
 npm install
 
 echo "Creating eslint.tar.gz..."
 tar cvz --exclude=eslint-plugin-mozilla --exclude=eslint-plugin-spidermonkey-js -f eslint.tar.gz node_modules
 
 echo "Adding eslint.tar.gz to tooltool..."
 rm tools/lint/eslint/manifest.tt
-./python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint.tar.gz --url="https://api.pub.build.mozilla.org/tooltool/"
+./python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint.tar.gz --url="https://tooltool.mozilla-releng.net/"
 
 echo "Uploading eslint.tar.gz to tooltool..."
-./python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint" --url="https://api.pub.build.mozilla.org/tooltool/"
+./python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint" --url="https://tooltool.mozilla-releng.net/"
 
 echo "Cleaning up..."
 mv manifest.tt tools/lint/eslint/manifest.tt
 rm eslint.tar.gz
 
 cd $DIR
 
 echo ""