diff --git a/.github/workflows/build_wheels.yaml b/.github/workflows/build_wheels.yaml
index cbf78568..14d48ba0 100644
--- a/.github/workflows/build_wheels.yaml
+++ b/.github/workflows/build_wheels.yaml
@@ -65,6 +65,16 @@ on:
         type: string
         default: ''
         required: false
+      cudaq_repo:
+        type: string
+        description: Optional CUDA-Q repository override.
+        default: ''
+        required: false
+      cudaq_ref:
+        type: string
+        description: Optional CUDA-Q ref override.
+        default: ''
+        required: false
       cache_key_suffix:
         type: string
         default: ''
@@ -76,7 +86,7 @@ on:
         required: false
 
 concurrency:
-  group: ${{ github.workflow }}-build-wheels-${{ github.ref }}
+  group: ${{ github.workflow }}-build-wheels-${{ github.ref }}-${{ inputs.cudaq_repo || 'default-repo' }}-${{ inputs.cudaq_ref || 'default-ref' }}
   cancel-in-progress: true
 
 jobs:
@@ -176,6 +186,9 @@ jobs:
       - name: Get required CUDAQ version
         id: get-cudaq-version
         uses: ./.github/actions/get-cudaq-version
+        with:
+          repo: ${{ inputs.cudaq_repo }}
+          ref: ${{ inputs.cudaq_ref }}
 
       - name: Get CUDAQ code
         uses: actions/checkout@v4
@@ -283,6 +296,9 @@ jobs:
       - name: Get required CUDAQ version
         id: get-cudaq-version
         uses: ./.github/actions/get-cudaq-version
+        with:
+          repo: ${{ inputs.cudaq_repo }}
+          ref: ${{ inputs.cudaq_ref }}
 
       - name: Get CUDAQ wheels
         uses: ./.github/actions/get-cudaq-wheels
diff --git a/.github/workflows/nightly_tests.yaml b/.github/workflows/nightly_tests.yaml
index a7dc3658..c2ef2502 100644
--- a/.github/workflows/nightly_tests.yaml
+++ b/.github/workflows/nightly_tests.yaml
@@ -6,14 +6,14 @@ on:
   workflow_dispatch:
 
 jobs:
-  wheels:
-    name: Build and test wheels
-    uses: ./.github/workflows/build_wheels.yaml
-    with:
-      build_type: Release
-      cudaq_wheels: Custom
-      cache_key_suffix: nightly
-    secrets: inherit
+  # wheels:
+  #   name: Build and test wheels
+  #   uses: ./.github/workflows/build_wheels.yaml
+  #   with:
+  #     build_type: Release
+  #     cudaq_wheels: Custom
+  #     cache_key_suffix: nightly
+  #   secrets: inherit
 
   resolve-cudaq-main:
     name: Resolve CUDA-Q main
@@ -74,57 +74,70 @@ jobs:
           save-ccache: false
           platform: ${{ matrix.platform }}-cu${{ steps.config.outputs.cuda_major }}
 
-  cudaq-main-all-libs:
-    name: All libs against CUDA-Q main
-    needs: [resolve-cudaq-main, build-cudaq-main]
-    uses: ./.github/workflows/all_libs.yaml
-    with:
-      cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
-      cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
-      cache_key_suffix: nightly
-    secrets: inherit
+  # cudaq-main-all-libs:
+  #   name: All libs against CUDA-Q main
+  #   needs: [resolve-cudaq-main, build-cudaq-main]
+  #   uses: ./.github/workflows/all_libs.yaml
+  #   with:
+  #     cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
+  #     cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
+  #     cache_key_suffix: nightly
+  #   secrets: inherit
 
-  cudaq-main-qec:
-    name: QEC against CUDA-Q main
-    needs: [resolve-cudaq-main, build-cudaq-main]
-    uses: ./.github/workflows/lib_qec.yaml
-    with:
-      cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
-      cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
-      cache_key_suffix: nightly
-    secrets: inherit
+  # cudaq-main-qec:
+  #   name: QEC against CUDA-Q main
+  #   needs: [resolve-cudaq-main, build-cudaq-main]
+  #   uses: ./.github/workflows/lib_qec.yaml
+  #   with:
+  #     cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
+  #     cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
+  #     cache_key_suffix: nightly
+  #   secrets: inherit
 
-  cudaq-main-solvers:
-    name: Solvers against CUDA-Q main
-    needs: [resolve-cudaq-main, build-cudaq-main]
-    uses: ./.github/workflows/lib_solvers.yaml
-    with:
-      cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
-      cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
-      cache_key_suffix: nightly
-    secrets: inherit
+  # cudaq-main-solvers:
+  #   name: Solvers against CUDA-Q main
+  #   needs: [resolve-cudaq-main, build-cudaq-main]
+  #   uses: ./.github/workflows/lib_solvers.yaml
+  #   with:
+  #     cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
+  #     cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
+  #     cache_key_suffix: nightly
+  #   secrets: inherit
+
+  # cudaq-main-docs:
+  #   name: Docs against CUDA-Q main
+  #   needs: [resolve-cudaq-main, build-cudaq-main]
+  #   uses: ./.github/workflows/docs.yaml
+  #   with:
+  #     cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
+  #     cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
+  #     cache_key_suffix: nightly
+  #   secrets: inherit
 
-  cudaq-main-docs:
-    name: Docs against CUDA-Q main
+  cudaq-main-wheels:
+    name: Wheels against CUDA-Q main
     needs: [resolve-cudaq-main, build-cudaq-main]
-    uses: ./.github/workflows/docs.yaml
+    uses: ./.github/workflows/build_wheels.yaml
     with:
+      build_type: Release
+      cudaq_wheels: Custom
+      cache_key_suffix: nightly
       cudaq_repo: ${{ needs.resolve-cudaq-main.outputs.repo }}
       cudaq_ref: ${{ needs.resolve-cudaq-main.outputs.ref }}
-      cache_key_suffix: nightly
     secrets: inherit
 
   cleanup-nightly-cache:
     name: Clean up nightly cache
     if: ${{ always() }}
     needs:
-      - wheels
+      # - wheels
       - resolve-cudaq-main
       - build-cudaq-main
-      - cudaq-main-all-libs
-      - cudaq-main-qec
-      - cudaq-main-solvers
-      - cudaq-main-docs
+      # - cudaq-main-all-libs
+      # - cudaq-main-qec
+      # - cudaq-main-solvers
+      # - cudaq-main-docs
+      - cudaq-main-wheels
     runs-on: ubuntu-latest
     permissions:
       actions: write