diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b2b7e3b34..fcff657a4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -35,7 +35,6 @@ jobs:
     name: Build (${{ matrix.host-platform }}, Python ${{ matrix.python-version }}, CUDA ${{ matrix.cuda-version }})
     if: ${{ github.repository_owner == 'nvidia' }}
     permissions:
-      id-token: write # This is required for configure-aws-credentials
       contents: read  # This is required for actions/checkout
     runs-on: ${{ (matrix.host-platform == 'linux-64' && 'linux-amd64-cpu8') ||
                  (matrix.host-platform == 'linux-aarch64' && 'linux-arm64-cpu8') ||
@@ -143,7 +142,7 @@ jobs:
             PARALLEL_LEVEL=${{ env.PARALLEL_LEVEL }}
           CIBW_ENVIRONMENT_WINDOWS: >
             CUDA_HOME="$(cygpath -w ${{ env.CUDA_PATH }})"
-          #  PARALLEL_LEVEL=${{ env.PARALLEL_LEVEL }}
+            PARALLEL_LEVEL=${{ env.PARALLEL_LEVEL }}
         with:
           package-dir: ./cuda_bindings/
           output-dir: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
@@ -230,14 +229,18 @@ jobs:
           - 0  # use CTK wheels
         runner:
           - default
+        exclude:
+          # To test this combo would require nontrivial installation steps.
+          - cuda-version: "12.0.1"
+            local-ctk: 0
         include:
           - host-platform: linux-64
             python-version: "3.12"
             cuda-version: "12.6.2"
+            local-ctk: 1
             runner: H100
     name: Test (${{ matrix.host-platform }}, Python ${{ matrix.python-version }}, CUDA ${{ matrix.cuda-version }}, Runner ${{ matrix.runner }}, ${{ (matrix.local-ctk == '1' && 'local CTK') || 'CTK wheels' }})
-    # The build stage could fail but we want the CI to keep moving.
-    if: ${{ github.repository_owner == 'nvidia' && !cancelled() }}
+    if: ${{ github.repository_owner == 'nvidia' }}
     permissions:
       contents: read  # This is required for actions/checkout
     needs:
@@ -255,8 +258,7 @@ jobs:
 
   doc:
     name: Docs
-    # The build stage could fail but we want the CI to keep moving.
-    if: ${{ github.repository_owner == 'nvidia' && !cancelled() }}
+    if: ${{ github.repository_owner == 'nvidia' }}
     # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
     permissions:
       id-token: write
diff --git a/.github/workflows/test-wheel.yml b/.github/workflows/test-wheel.yml
index 652633d0b..7e911640e 100644
--- a/.github/workflows/test-wheel.yml
+++ b/.github/workflows/test-wheel.yml
@@ -122,13 +122,17 @@ jobs:
             echo "LATEST_PRIOR_RUN_ID not found!"
             exit 1
           fi
+
           gh run download $LATEST_PRIOR_RUN_ID -p ${OLD_BASENAME} -R NVIDIA/cuda-python
           ls -al $OLD_BASENAME
           mkdir -p "${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}"
           mv $OLD_BASENAME/*.whl "${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}"/
+          rmdir $OLD_BASENAME
 
           gh run download $LATEST_PRIOR_RUN_ID -p cuda-python-wheel -R NVIDIA/cuda-python
+          ls -al cuda-python-wheel
           mv cuda-python-wheel/*.whl .
+          rmdir cuda-python-wheel
 
       - name: Display structure of downloaded cuda-python artifacts
         run: |