diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32a25902..dd189313 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -126,27 +126,27 @@ jobs:
     with:
       changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
 
-  upload-build-artifacts:
-    name: Deploy Prebuilt Python Builds
-    if: ${{ inputs.kind == 'release' && success() }}
-    uses: ./.github/workflows/deploy-build-action.yml
-    needs:
-      - build-python-package
-      - build-native
-      - test-fips
-      #- build-cross
-    with:
-      version: "${{ needs.build-python-package.outputs.version }}"
+  #upload-build-artifacts:
+  #  name: Deploy Prebuilt Python Builds
+  #  if: ${{ inputs.kind == 'release' && success() }}
+  #  uses: ./.github/workflows/deploy-build-action.yml
+  #  needs:
+  #    - build-python-package
+  #    - build-native
+  #    - test-fips
+  #    #- build-cross
+  #  with:
+  #    version: "${{ needs.build-python-package.outputs.version }}"
 
-  upload-toolchain-artifacts:
-    name: Deploy Toolchain
-    if: ${{ inputs.kind == 'release' && success() }}
-    uses: ./.github/workflows/deploy-toolchain-action.yml
-    needs:
-      - build-python-package
-      - toolchain
-    with:
-      version: "${{ needs.build-python-package.outputs.version }}"
+  #upload-toolchain-artifacts:
+  #  name: Deploy Toolchain
+  #  if: ${{ inputs.kind == 'release' && success() }}
+  #  uses: ./.github/workflows/deploy-toolchain-action.yml
+  #  needs:
+  #    - build-python-package
+  #    - toolchain
+  #  with:
+  #    version: "${{ needs.build-python-package.outputs.version }}"
 
   deploy-python-package:
     name: Deploy Python Package
diff --git a/relenv/common.py b/relenv/common.py
index b9bf6c5b..cf397c53 100644
--- a/relenv/common.py
+++ b/relenv/common.py
@@ -28,7 +28,10 @@
 
 MACOS_DEVELOPMENT_TARGET = "10.15"
 
-CHECK_HOSTS = ("repo.saltproject.io", "woz.io")
+CHECK_HOSTS = (
+    "packages.broadcom.com/artifactory/saltproject-generic" "repo.saltproject.io",
+    "woz.io",
+)
 
 arches = {
     LINUX: (
diff --git a/relenv/toolchain.py b/relenv/toolchain.py
index c301affa..e20f707d 100644
--- a/relenv/toolchain.py
+++ b/relenv/toolchain.py
@@ -30,6 +30,8 @@
 TC_URL = "https://{hostname}/relenv/{version}/toolchain/{host}/{triplet}.tar.xz"
 CICD = "CI" in os.environ
 
+LAST_RELENV_W_TOOLCHAIN = "0.17.4"
+
 
 def setup_parser(subparsers):
     """
@@ -91,7 +93,10 @@ def fetch(arch, toolchain, clean=False, version=__version__):
         check_hosts = [os.environ["RELENV_FETCH_HOST"]]
     for host in check_hosts:
         url = TC_URL.format(
-            hostname=host, version=version, host=platform.machine(), triplet=triplet
+            hostname=host,
+            version=LAST_RELENV_W_TOOLCHAIN,
+            host=platform.machine(),
+            triplet=triplet,
         )
         if check_url(url, timeout=5):
             break