diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index da1b2b0dc..4862fb890 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -35,6 +35,9 @@ jobs:
       - test-self-hosted-server
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
+    if: always()
+    with:
+      needs: ${{ toJSON(needs) }}
   check-lean-ci:
     runs-on: ubuntu-latest
     outputs:
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 7b1f772c3..8f6973a73 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -10,8 +10,6 @@ package_dir=$2
 
 source rapids-configure-sccache
 source rapids-date-string
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 # Update the version to accomdate nightly and release changes for the wheel name
diff --git a/ci/build_wheel_cuopt.sh b/ci/build_wheel_cuopt.sh
index 83f715172..0ba991e57 100755
--- a/ci/build_wheel_cuopt.sh
+++ b/ci/build_wheel_cuopt.sh
@@ -6,8 +6,6 @@
 
 set -euo pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 # Install rockylinux repo
diff --git a/ci/build_wheel_cuopt_mps_parser.sh b/ci/build_wheel_cuopt_mps_parser.sh
index 9c7037368..f87cb729f 100755
--- a/ci/build_wheel_cuopt_mps_parser.sh
+++ b/ci/build_wheel_cuopt_mps_parser.sh
@@ -6,8 +6,6 @@
 
 set -euo pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 package_dir="python/cuopt/cuopt/linear_programming"
diff --git a/ci/build_wheel_cuopt_server.sh b/ci/build_wheel_cuopt_server.sh
index 4193cde43..1be325303 100755
--- a/ci/build_wheel_cuopt_server.sh
+++ b/ci/build_wheel_cuopt_server.sh
@@ -5,8 +5,6 @@
 
 set -euo pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 package_dir="python/cuopt_server"
diff --git a/ci/build_wheel_cuopt_sh_client.sh b/ci/build_wheel_cuopt_sh_client.sh
index 0e52ed434..f5083b5eb 100755
--- a/ci/build_wheel_cuopt_sh_client.sh
+++ b/ci/build_wheel_cuopt_sh_client.sh
@@ -5,8 +5,6 @@
 
 set -euo pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 package_dir="python/cuopt_self_hosted"
diff --git a/ci/build_wheel_libcuopt.sh b/ci/build_wheel_libcuopt.sh
index 164d025e9..a6dd64c7d 100755
--- a/ci/build_wheel_libcuopt.sh
+++ b/ci/build_wheel_libcuopt.sh
@@ -4,8 +4,6 @@
 
 set -euo pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 package_name="libcuopt"
diff --git a/ci/test_self_hosted_service.sh b/ci/test_self_hosted_service.sh
index 6b126b809..43d549d55 100755
--- a/ci/test_self_hosted_service.sh
+++ b/ci/test_self_hosted_service.sh
@@ -5,8 +5,6 @@
 
 set -euo pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 # Download the cuopt built in the previous step
diff --git a/ci/test_wheel_cuopt.sh b/ci/test_wheel_cuopt.sh
index 22392c7e8..d761b2721 100755
--- a/ci/test_wheel_cuopt.sh
+++ b/ci/test_wheel_cuopt.sh
@@ -7,8 +7,6 @@ set -euo pipefail
 
 # sets up a constraints file for 'pip' and puts its location in an exported variable PIP_EXPORT,
 # so those constraints will affect all future 'pip install' calls
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 # Download the packages built in the previous step
diff --git a/ci/test_wheel_cuopt_server.sh b/ci/test_wheel_cuopt_server.sh
index 652638878..83de85c8a 100755
--- a/ci/test_wheel_cuopt_server.sh
+++ b/ci/test_wheel_cuopt_server.sh
@@ -5,8 +5,6 @@
 
 set -eou pipefail
 
-RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX="true"
-export RAPIDS_INIT_PIP_REMOVE_NVIDIA_INDEX
 source rapids-init-pip
 
 # Download the packages built in the previous step