diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index c961ffa094c..543beefe2ba 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -5,7 +5,7 @@ labels: [triage]
 body:
   - type: markdown
     attributes:
-      value: Thank you for helping us improve CUDA Quantum.
+      value: Thank you for helping us improve CUDA-Q.
 
   - type: checkboxes
     attributes:
@@ -60,7 +60,7 @@ body:
     attributes:
       label: Environment
       description: |
-        For the CUDA Quantum version, please give the actual version number
+        For the CUDA-Q version, please give the actual version number
         (_e.g._ 0.3.0) if you are using a release version, or the first 7-8
         characters of the commit hash if you have built from source. If you are
         using the python interface _and_ have not built it from source, you can
@@ -69,7 +69,7 @@ body:
         is relevant to the list.
       # Keep the trailing spaces on the following lines
       value: |
-        - **CUDA Quantum version**: 
+        - **CUDA-Q version**: 
         - **Python version**: 
         - **C++ compiler**: 
         - **Operating system**: 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 5a938951ae5..481afe21e78 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -5,7 +5,7 @@ labels: [enhancement]
 body:
   - type: markdown
     attributes:
-      value: Thank you for helping us improve CUDA Quantum.
+      value: Thank you for helping us improve CUDA-Q.
 
   - type: checkboxes
     attributes:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e20074e6258..52e6d843959 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,5 @@
 <!--
-Thanks for helping us improve CUDA Quantum!
+Thanks for helping us improve CUDA-Q!
 
 ⚠️ The pull request title should be concise and understandable for all.
 ⚠️ If your pull request fixes an open issue, please link to the issue.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 190f99a6995..7c004474147 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -34,6 +34,7 @@ jobs:
     # Consider using larger runners or machines with greater resources for possible analysis time improvements.
     runs-on: 'ubuntu-latest'
     permissions:
+      packages: read # required to fetch internal or private CodeQL packs
       security-events: write
       # read permissions below are only required for workflows in private repositories
       actions: read
@@ -47,10 +48,11 @@ jobs:
         # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
         # For analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-        - language: c-cpp
-          build-mode: none # Consider setting this to manual and providing a build command to get more accurate scanning
         - language: python
-          build-mode: none
+          build-mode: none # Consider setting this to manual and providing a build command to get more accurate scanning
+        # FIXME: enable code scanning for C++
+        # - language: c-cpp
+        #   build-mode: manual # Consider setting this to manual and providing a build command to get more accurate scanning
 
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index e088dcba70e..ab2b77ae1ac 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -194,7 +194,7 @@ jobs:
           NGC_CLI_API_KEY: ${{ secrets.NGC_CREDENTIALS }}
           NGC_CLI_ORG: ${{ env.NGC_QUANTUM_ORG }}
           NGC_CLI_TEAM: cuda-quantum
-        # When a new REST version is introduced, NVQC_REST_PAYLOAD_VERSION needs to be updated in lockstep with the new nightly CUDA Quantum image. 
+        # When a new REST version is introduced, NVQC_REST_PAYLOAD_VERSION needs to be updated in lockstep with the new nightly CUDA Quantum image.
         # Otherwise, deployment of the test function will fail.
         run: |
           # We run with CUDAQ_SER_CODE_EXEC set. The final NVQC deployment may
@@ -268,7 +268,7 @@ jobs:
             filelist="targettests/*/*.cpp"
             echo "testlist=$filelist" >> $GITHUB_OUTPUT
           fi
-      
+
       - name: Setup anyon account
         # This step is currently bypassed during nightly runs due to
         # maintenance. Restore the if check to the original value when
@@ -405,18 +405,15 @@ jobs:
           fi
         shell: bash
 
-      - name: Submit to IQM Demo server
+      - name: Submit to a mocked IQM Resonance server
         if: (success() || failure()) && (inputs.target == 'iqm' || github.event_name == 'schedule' || inputs.target == 'nightly')
         run: |
-          # Must install iqm-cortex-cli to authenticate
-          pip install iqm-cortex-cli
-          echo "### Submit to IQM Demo server" >> $GITHUB_STEP_SUMMARY
-          # IQM demo server info is from: https://demo.qc.iqm.fi/cocos/info/
-          cortex init --config-file ${HOME}/.config/iqm-cortex-cli/config.json --tokens-file ${HOME}/.cache/iqm-cortex-cli/tokens.json --auth-server-url https://demo.qc.iqm.fi/auth --client-id iqm_client --realm cortex --username '${{ secrets.IQM_USER }}'
-          cortex auth login --username '${{ secrets.IQM_USER }}' --password '${{ secrets.IQM_PASSWORD }}'
-          echo ":white_check_mark: Successfully installed iqm-cortex-cli and logged in" >> $GITHUB_STEP_SUMMARY
-          # Use the demo machine, which is Adonis architecture
-          export IQM_SERVER_URL="https://demo.qc.iqm.fi/cocos"
+          echo "### Submit to IQM Resonance" >> $GITHUB_STEP_SUMMARY
+          # Create a json file with the Resonance auth token
+          echo "{ \"access_token\": \"${{ secrets.IQM_TOKEN }}\" }" > .resonance.api-token.json
+          export IQM_TOKENS_FILE=".resonance.api-token.json"
+          # Use IQM Resonance Pyrite mock, which implements the Adonis architecture
+          export IQM_SERVER_URL="https://cocos.resonance.meetiqm.com/pyrite:test"
           export CUDAQ_LOG_LEVEL="info"
           set +e # Allow script to keep going through errors
           test_err_sum=0
@@ -443,8 +440,6 @@ jobs:
               ;;
             esac
           done
-          set -e # Re-enable exit code error checking
-          cortex auth logout -f
           echo ":white_check_mark: Successfully logged out of IQM" >> $GITHUB_STEP_SUMMARY
           if [ ! $test_err_sum -eq 0 ]; then
             echo "::error::${test_err_sum} tests failed. See step summary for a list of failures"
@@ -801,7 +796,7 @@ jobs:
           python_version=${{ inputs.python_version || env.python_version }}
           workflow_id=${{ inputs.workflow_id }}
           # Helper to get the *valid* Publishing run Id for a commit hash
-          # Notes: runs that have 'CUDA Quantum Python wheels' jobs skipped are not considered.
+          # Notes: runs that have 'CUDA-Q Python wheels' jobs skipped are not considered.
           function get_publishing_run_id {
             # Find all Publishing runs, we'll look into its jobs' status later
             if [[ -z "$1" ]]; then
@@ -810,9 +805,9 @@ jobs:
               publishing_run_ids=$(gh run list --commit $1 --workflow Publishing --json databaseId --jq .[].databaseId)
             fi
             for run_id in $publishing_run_ids ; do
-                # Look into its jobs: if "CUDA Quantum Python wheels" matrix build was performed,
-                # then we have multiple jobs, like "CUDA Quantum Python wheels (python_arm64....")
-                cuda_wheel_build_jobs=$(gh run view $run_id --jq '.jobs.[] | select(.name | startswith("CUDA Quantum Python wheels (python_")).name' --json jobs)
+                # Look into its jobs: if "CUDA-Q Python wheels" matrix build was performed,
+                # then we have multiple jobs, like "CUDA-Q Python wheels (python_arm64....")
+                cuda_wheel_build_jobs=$(gh run view $run_id --jq '.jobs.[] | select(.name | startswith("CUDA-Q Python wheels (python_")).name' --json jobs)
                 if [ ! -z "$cuda_wheel_build_jobs" ]; then
                   # This is a valid run that produces wheel artifacts
                   echo $run_id
@@ -828,7 +823,7 @@ jobs:
             echo "Using artifacts from workflow id $workflow_id"
             # Allow error when trying to download wheel artifacts since they might be expired.
             set +e
-            gh run download $workflow_id --name "x86_64-py$python_version-wheels"
+            gh run download $workflow_id --name "x86_64-cu12-py$python_version-wheels"
             retVal=$?
             set -e
             if [ $retVal -ne 0 ]; then
@@ -840,7 +835,7 @@ jobs:
             python_version_filename=$(echo "${python_version//.}")
             # Install Python and the wheel
             apt-get update && apt-get install -y --no-install-recommends python$python_version python3-pip
-            wheelfile=$(find . -name "cuda_quantum_cu11*cp$python_version_filename*x86_64.whl")
+            wheelfile=$(find . -name "cuda_quantum_cu12*cp$python_version_filename*x86_64.whl")
             python$python_version -m pip install $wheelfile
             echo "skipped=false" >> $GITHUB_OUTPUT
           else
diff --git a/.github/workflows/nvqc_regression_tests.yml b/.github/workflows/nvqc_regression_tests.yml
index a19377f6294..0e56a5867fb 100644
--- a/.github/workflows/nvqc_regression_tests.yml
+++ b/.github/workflows/nvqc_regression_tests.yml
@@ -202,7 +202,8 @@ jobs:
 
           # Test NVQC Python examples + Python MLIR execution tests (not IR tests)
           python3 -m pip install pytest
-          for ex in `find examples/python python/tests/mlir/target -name '*.py'`; do
+          # Disabling building_kernels as the state is not yet supported on NVQC
+          for ex in `find examples/python python/tests/mlir/target -name '*.py' ! -name '*building_kernels*'`; do
             filename=$(basename -- "$ex")
             filename="${filename%.*}"
             echo "Testing $filename:"
@@ -262,7 +263,7 @@ jobs:
           python_version=${{ inputs.python_version || env.python_version }}
           workflow_id=${{ inputs.workflow_id }}
           # Helper to get the *valid* Publishing run Id for a commit hash
-          # Notes: runs that have 'CUDA Quantum Python wheels' jobs skipped are not considered.
+          # Notes: runs that have 'CUDA-Q Python wheels' jobs skipped are not considered.
           function get_publishing_run_id {
             # Find all Publishing runs, we'll look into its jobs' status later
             if [[ -z "$1" ]]; then
@@ -271,9 +272,9 @@ jobs:
               publishing_run_ids=$(gh run -R NVIDIA/cuda-quantum list --commit $1 --workflow Publishing --json databaseId --jq .[].databaseId)
             fi
             for run_id in $publishing_run_ids ; do
-                # Look into its jobs: if "CUDA Quantum Python wheels" matrix build was performed,
-                # then we have multiple jobs, like "CUDA Quantum Python wheels (python_arm64....")
-                cuda_wheel_build_jobs=$(gh run -R NVIDIA/cuda-quantum view $run_id --jq '.jobs.[] | select(.name | startswith("CUDA Quantum Python wheels (python_")).name' --json jobs)
+                # Look into its jobs: if "CUDA-Q Python wheels" matrix build was performed,
+                # then we have multiple jobs, like "CUDA-Q Python wheels (python_arm64....")
+                cuda_wheel_build_jobs=$(gh run -R NVIDIA/cuda-quantum view $run_id --jq '.jobs.[] | select(.name | startswith("CUDA-Q Python wheels (python_")).name' --json jobs)
                 if [ ! -z "$cuda_wheel_build_jobs" ]; then
                   # This is a valid run that produces wheel artifacts
                   echo $run_id
@@ -301,7 +302,7 @@ jobs:
             python_version_filename=$(echo "${python_version//.}")
             # Install Python and the wheel
             apt-get update && apt-get install -y --no-install-recommends python$python_version python3-pip
-            wheelfile=$(find . -name "cuda_quantum_cu11*cp$python_version_filename*x86_64.whl")
+            wheelfile=$(find . -name "cuda_quantum_cu12*cp$python_version_filename*x86_64.whl")
             python$python_version -m pip install $wheelfile
             echo "skipped=false" >> $GITHUB_OUTPUT
           else
@@ -320,7 +321,7 @@ jobs:
           set +e # Allow script to keep going through errors
           python$python_version -m pip install pytest
           test_err_sum=0
-          for ex in `find examples/python python/tests/mlir/target -name '*.py'; do
+          for ex in `find examples/python python/tests/mlir/target -name '*.py'`; do
             filename=$(basename -- "$ex")
             filename="${filename%.*}"
             echo "Testing $filename:"
diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
index 08d194db49e..a6e95d0b89d 100644
--- a/.github/workflows/publishing.yml
+++ b/.github/workflows/publishing.yml
@@ -163,13 +163,14 @@ jobs:
           # Using the image sha as the file name and the docker image name
           # as the folder is convenient for the GitLab CI.
 
-          if ${{ inputs.manual_assets_creation == '' }}; then 
+          publishing_assets=${{ inputs.manual_assets_creation || vars.publishing_assets || '' }}
+          if [ -z "${publishing_assets}" ]; then 
             git config --global user.name "cuda-quantum-bot"
             git config --global user.email "cuda-quantum-bot@users.noreply.github.com"
             current_branch=$(git rev-parse --abbrev-ref HEAD)
           else
-            gh release download ${{ inputs.manual_assets_creation }} -R ${{ vars.assets_repo || github.repository }}
-            unzip -d /tmp/ ${{ inputs.manual_assets_creation }}.zip && rm -rf ${{ inputs.manual_assets_creation }}.zip
+            gh release download ${publishing_assets} -R ${{ vars.assets_repo || github.repository }}
+            unzip -d /tmp/ ${publishing_assets}.zip && rm -rf ${publishing_assets}.zip
           fi
 
           function create_assets {
@@ -190,7 +191,7 @@ jobs:
             echo "release-id: $release_id" >> "$1.txt"
             echo "artifacts-url: $artifacts_url" >> "$1.txt"
 
-            if ${{ inputs.manual_assets_creation == '' }}; then 
+            if [ -z "${publishing_assets}" ]; then 
               echo "Pushing $1 to $staging_branch"
               mkdir -p "$staging_folder" && mv -v "$1.txt" "$staging_folder/$file_id"
               git add "$staging_folder" && git commit -m "$image_hash"
@@ -200,14 +201,16 @@ jobs:
               if [ -z "$(gh release list -R ${{ vars.assets_repo || github.repository }} | grep -s $release_id)" ]; then
                 versions=`gh release list -R ${{ vars.assets_repo || github.repository }} --exclude-drafts --exclude-pre-releases | egrep -o "([0-9]{1,}\.)+[0-9]{1,}\S*" | sort -r -V`
                 latest_tag=`echo $versions | cut -d ' ' -f 1`
-
-                source_sha=${{ steps.artifacts.outputs.github_commit }}
                 rel_notes="This release draft is created by a publishing workflow with manual assets creation."
-                rel_notes+=$(echo "<br/>GitHub commit [$source_sha](${{ github.repository }}/tree/$source_sha)")
+                rel_notes+=$(echo "<br/>GitHub commit [${{ steps.artifacts.outputs.github_commit }}](${{ github.repository }}/tree/${{ steps.artifacts.outputs.github_commit }})")
 
                 echo "Creating draft release $release_id."
+                # If we use a separate repo to store temporary assets, we can't use the github commit as the target
+                # since it does not exist on that repo. However, these drafts are deleted again at the end of the workflow 
+                # and nothing relies on the target. 
                 gh release create $release_id --title $release_id -R ${{ vars.assets_repo || github.repository }} \
-                  --target $source_sha --draft --prerelease \
+                  --target ${{ vars.assets_repo && 'main' || steps.artifacts.outputs.github_commit }} \
+                  --draft --prerelease \
                   --generate-notes --notes-start-tag $latest_tag --notes "$rel_notes"
               else
                 echo "::error::Release $release_id already exists."
@@ -215,9 +218,9 @@ jobs:
               fi              
               
               assets_folder=$(echo $release_id | cut -d _ -f2-)
-              upload=`find /tmp/${{ inputs.manual_assets_creation }}/$assets_folder -name '*.zip'`
+              upload=`find /tmp/${publishing_assets}/$assets_folder -name '*.zip'`
               echo "Uploading assets $upload $1.txt..."
-              echo $upload | xargs gh release upload $release_id -R ${{ github.repository }} --clobber "$1.txt"
+              echo $upload | xargs gh release upload $release_id -R ${{ vars.assets_repo || github.repository }} --clobber "$1.txt"
             fi
           }
 
@@ -247,7 +250,7 @@ jobs:
 
       # We can delete staging branch now after the expected draft releases have been created.
       - name: Clean up
-        if: steps.assets_creation.outcome != 'skipped' && inputs.manual_assets_creation == ''
+        if: steps.assets_creation.outcome != 'skipped' && inputs.manual_assets_creation == '' && vars.publishing_assets == ''
         run: |
           # Clean up the staging branch that was used to trigger the GitLab pipeline.
           git config --global user.name "cuda-quantum-bot"
@@ -277,7 +280,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.REPO_BOT_ACCESS_TOKEN }}
 
-      - name: Retrieve 
+      - name: Retrieve CUDA-Q assets
         id: assets_retrieval
         run: |
           assets_folder=/tmp/assets && mkdir "$assets_folder" && cd "$assets_folder"
@@ -312,7 +315,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.REPO_BOT_ACCESS_TOKEN }}
   
-      - name: Upload assets
+      - name: Upload CUDA-Q assets
         if: steps.artifacts.outputs.releases != ''
         uses: actions/upload-artifact@v4
         with:
@@ -325,7 +328,7 @@ jobs:
     name: CUDA-Q Docker image
     if: ${{ toJson(fromJson(needs.assets.outputs.docker_images).info_files) != '[]' }}
     needs: assets
-    runs-on: ubuntu-latest
+    runs-on: linux-amd64-cpu8
     permissions:
       contents: read
       packages: write
@@ -370,7 +373,7 @@ jobs:
         run: |
           release_id=${{ fromJson(needs.assets.outputs.docker_images)[format('{0}', matrix.info_file)].release_id }}
           assets_folder=assets && mkdir "$assets_folder" && cd "$assets_folder"
-          cp -r /tmp/assets/${{ matrix.info_file }}/. "$(pwd)"
+          cp -r /tmp/assets/${{ matrix.info_file }}/. "$(pwd)" && rm -rf /tmp/assets
           if ${{ github.event_name == 'workflow_dispatch' && inputs.include_docs }}; then
             mkdir documentation && mv -v /tmp/assets/documentation/* documentation
           fi
@@ -512,7 +515,7 @@ jobs:
     needs: assets
     permissions:
       contents: read
-      packages: write
+      packages: read
       id-token: write
 
     environment:
@@ -571,11 +574,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_READONLY_TOKEN }}
 
-      - name: Log in to default registry
-        if: steps.release_info.outputs.push_to_ngc != 'true'
+      - name: Log in to GitHub CR
         uses: docker/login-action@v3
         with:
-          registry: ${{ vars.registry }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
@@ -620,6 +622,7 @@ jobs:
     needs: assets
     permissions:
       contents: read
+      packages: read
 
     environment:
       name: ghcr-deployment
@@ -675,6 +678,13 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_READONLY_TOKEN }}
 
+      - name: Log in to GitHub CR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
       - name: Set up context for buildx
         run: |
           docker context create builder_context
@@ -790,6 +800,9 @@ jobs:
 
     container:
       image: ${{ matrix.image_hash }}
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ github.token }}
       options: --user root # otherwise step summary doesn't work
       env:
         NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
@@ -993,7 +1006,7 @@ jobs:
       - name: Load wheels
         uses: actions/download-artifact@v4
         with:
-          pattern: '*py3.10-wheels'
+          pattern: '*-wheels'
           path: /tmp/wheels
           merge-multiple: true
 
@@ -1078,7 +1091,7 @@ jobs:
       - name: Load wheels
         uses: actions/download-artifact@v4
         with:
-          pattern: '*py3.10-wheels'
+          pattern: '*-wheels'
           path: /tmp/wheels
           merge-multiple: true
 
@@ -1187,7 +1200,7 @@ jobs:
           gh release create $release_id --title $release_id -R ${{ github.repository }} \
             --target $github_commit --draft $prerelease \
             --generate-notes --notes-start-tag $latest_tag --notes "$rel_notes"
-          gh release upload $release_id -R ${{ github.repository }} install_cuda_quantum.* --clobber
+          gh release upload $release_id -R ${{ github.repository }} install_cuda_quantum* --clobber
           gh release upload $release_id -R ${{ github.repository }} wheelhouse.zip --clobber
           gh release upload $release_id -R ${{ github.repository }} metapackages.zip --clobber
           gh release edit $release_id -R ${{ github.repository }} \
diff --git a/.github/workflows/publishing_stable.yml b/.github/workflows/publishing_stable.yml
index 284da36ca52..bfb26a8c1e0 100644
--- a/.github/workflows/publishing_stable.yml
+++ b/.github/workflows/publishing_stable.yml
@@ -1,15 +1,29 @@
 on:
   workflow_dispatch:
     inputs:
+      image_tag:
+        type: string
+        required: true
+        description: The tag of the cuda-quantum image on the nightly channel to push to the stable channel.
       image_short_name:
         type: string 
-        description: The short name of the image to pull from the nightly channel and push to the stable channel.
+        required: false
         default: cuda-quantum
+        description: The short name of the image to pull from the nightly channel and push to the stable channel.
+      image_source_location:
+        type: string
+        default: nvcr.io/nvidia/nightly
         required: false
-      image_tag:
+        description: The registry prefix for the image to pull. 
+      image_target_location:
         type: string
-        description: The tag of the cuda-quantum image on the nightly channel to push to the stable channel.
-        required: true
+        default: nvcr.io/nvidia/quantum
+        required: false
+        description: The registry prefix for the image to push.
+      ngc_api_key:
+        type: string
+        required: false
+        description: The API key to use when authenticating with NGC.
 
 name: Push stable release
 
@@ -19,6 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      packages: write
 
     environment:
       name: ghcr-deployment
@@ -28,19 +43,39 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Configure registries
+        id: config
+        run: |  
+          NGC_API_KEY=$(jq -r '.inputs.ngc_api_key' $GITHUB_EVENT_PATH)
+          echo "::add-mask::$NGC_API_KEY"
+          if echo "${{ inputs.image_target_location }}" | grep -q "^nvcr.io"; then 
+            ngc_org=`echo "${{ inputs.image_target_location }}" | cut -d / -f2`
+            ngc_team=`echo "${{ inputs.image_target_location }}" | cut -d / -f3`
+            echo "ngc_org=$ngc_org" >> $GITHUB_OUTPUT
+            echo "ngc_team=$ngc_team" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Log in to the container registry
+        if: vars.registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.registry }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
       - name: Log in to NGC registry
         uses: docker/login-action@v3
         with:
           registry: 'nvcr.io'
           username: '$oauthtoken'
-          password: ${{ secrets.NGC_CREDENTIALS }}
+          password: ${{ inputs.ngc_api_key || secrets.NGC_CREDENTIALS }}
 
-      - name: Pull nightly image
-        id: nightly_image
+      - name: Prepare image
+        id: setup
         run: |
-          nightly_image=nvcr.io/nvidia/nightly/${{ inputs.image_short_name }}:${{ inputs.image_tag }}
+          nightly_image=${{ inputs.image_source_location }}/${{ inputs.image_short_name }}:${{ inputs.image_tag }}
           echo "FROM $nightly_image" >> ngc.Dockerfile
-          if [ "$(echo ${{ inputs.image_tag }} | egrep -o '([0-9]{1,}\.)+[0-9]{1,}')" != "${{ inputs.image_tag }}" ]; then
+          if [ "$(echo ${{ inputs.image_tag }} | egrep -o 'cu[0-9]{1,2}-([0-9]{1,}\.)+[0-9]{1,}')" != "${{ inputs.image_tag }}" ]; then
             echo "::error::Only non-prerelease tags can be pushed to stable."
             exit 1
           fi
@@ -66,11 +101,11 @@ jobs:
         id: metadata
         uses: docker/metadata-action@v5
         with:
-          images: nvcr.io/nvidia/quantum/${{ inputs.image_short_name }}
+          images: ${{ inputs.image_target_location }}/${{ inputs.image_short_name }}
           flavor: latest=false
           tags: type=raw,value=${{ inputs.image_tag }}
           labels: |
-            ${{ steps.nightly_image.outputs.labels }}
+            ${{ steps.setup.outputs.labels }}
 
       - name: Copy cuda-quantum NGC image
         id: copy_build
@@ -80,21 +115,36 @@ jobs:
           file: ngc.Dockerfile
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          platforms: ${{ steps.nightly_image.outputs.platforms }}
+          platforms: ${{ steps.setup.outputs.platforms }}
           push: true
 
+      - name: Install Cosign
+        if: steps.config.outputs.ngc_org == ''
+        uses: sigstore/cosign-installer@v3.3.0
+        with:
+          cosign-release: 'v2.2.2'
+
+      - name: Sign image with GitHub OIDC Token
+        if: steps.config.outputs.ngc_org == ''
+        env:
+          DIGEST: ${{ steps.copy_build.outputs.digest }}
+          TAGS: ${{ steps.metadata.outputs.tags }}
+        run: cosign sign --yes --recursive "${TAGS}@${DIGEST}"
+
       - name: Install NGC CLI
+        if: steps.config.outputs.ngc_org != ''
         uses: ./.github/actions/install-ngc-cli
         with:
           version: 3.31.0
           checksum: b715e503e2c0b44814a51f330eafd605f5d240ea0987bf615700d359c993f138
 
       - name: Sign image with NGC CLI
+        if: steps.config.outputs.ngc_org != ''
         env:
           TAGS: ${{ steps.metadata.outputs.tags }}
-          NGC_CLI_API_KEY: ${{ secrets.NGC_CREDENTIALS }}
-          NGC_CLI_ORG: ${{ github.repository_owner }}
-          NGC_CLI_TEAM: 'quantum'
+          NGC_CLI_API_KEY: ${{ inputs.ngc_api_key || secrets.NGC_CREDENTIALS }}
+          NGC_CLI_ORG: ${{ steps.config.outputs.ngc_org }}
+          NGC_CLI_TEAM: ${{ steps.config.outputs.ngc_team }}
         run: |
           echo "Signing ${TAGS}"
           ngc-cli/ngc registry image publish --source ${TAGS} ${TAGS} --sign
diff --git a/.github/workflows/python_wheels.yml b/.github/workflows/python_wheels.yml
index 8e542a0b2ea..8f90b52ce6f 100644
--- a/.github/workflows/python_wheels.yml
+++ b/.github/workflows/python_wheels.yml
@@ -291,7 +291,7 @@ jobs:
             # Parse README content to install openmpi
             conda_script="$(awk '/(Begin conda install)/{flag=1;next}/(End conda install)/{flag=0}flag' $metadata | grep . | sed '/^```/d')" 
             # Skip the installation of CUDA since we don't need CUDA for this test.
-            regex='conda install -y -n cuda-quantum.*cuda'
+            regex='conda install -y -n cuda-env.*cuda'
             while IFS= read -r line; do
               if [[ ! "$line" =~ $regex ]]; then
                   # Replace Python version
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 62c5b8fc282..1854e4e058a 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -2,7 +2,7 @@ header:
   license:
     spdx-id: Apache-2.0
     copyright-owner: NVIDIA Corporation & Affiliates
-    software-name: CUDA Quantum
+    software-name: CUDA-Q
 
     content: |
       Copyright (c) 2023 - 2024 NVIDIA Corporation & Affiliates.
diff --git a/docker/build/assets.Dockerfile b/docker/build/assets.Dockerfile
index 8f14d77342d..e1b267823a9 100644
--- a/docker/build/assets.Dockerfile
+++ b/docker/build/assets.Dockerfile
@@ -12,13 +12,13 @@
 #
 # Usage:
 # Must be built from the repo root with:
-#   docker build -t ghcr.io/nvidia/cuda-quantum-assets:amd64-cu11-llvm-main -f docker/build/assets.Dockerfile .
+#   docker build -t ghcr.io/nvidia/cuda-quantum-assets:amd64-cu12-llvm-main -f docker/build/assets.Dockerfile .
 
 # [Operating System]
 ARG base_image=amd64/almalinux:8
 FROM ${base_image} AS prereqs
 SHELL ["/bin/bash", "-c"]
-ARG cuda_version=11.8
+ARG cuda_version=12.0
 ENV CUDA_VERSION=${cuda_version}
 
 # When a dialogue box would be needed during install, assume default configurations.
@@ -187,6 +187,12 @@ RUN dnf install -y --nobest --setopt=install_weak_deps=False ${PYTHON}-devel &&
     ${PYTHON} -m pip install numpy build auditwheel patchelf
 
 RUN cd /cuda-quantum && source scripts/configure_build.sh && \
+    if [ "${CUDA_VERSION#11.}" != "${CUDA_VERSION}" ]; then \
+        cublas_version=11.11 && \
+        sed -i "s/-cu12/-cu11/g" pyproject.toml && \
+        sed -i -E "s/(nvidia-cublas-cu[0-9]* ~= )[0-9\.]*/\1${cublas_version}/g" pyproject.toml && \
+        sed -i -E "s/(nvidia-cuda-runtime-cu[0-9]* ~= )[0-9\.]*/\1${CUDA_VERSION}/g" pyproject.toml; \
+    fi && \
     # Needed to retrigger the LLVM build, since the MLIR Python bindings
     # are not built in the prereqs stage.
     rm -rf "${LLVM_INSTALL_PREFIX}" && \
diff --git a/docker/build/cudaq.dev.Dockerfile b/docker/build/cudaq.dev.Dockerfile
index 8fd9d8ac372..509362a1ab5 100644
--- a/docker/build/cudaq.dev.Dockerfile
+++ b/docker/build/cudaq.dev.Dockerfile
@@ -17,7 +17,7 @@
 # 3) set the CC and CXX environment variable to use the same compiler toolchain
 #    as the LLVM dependencies have been built with.
 
-ARG base_image=ghcr.io/nvidia/cuda-quantum-devdeps:ext-cu11.8-gcc11-main
+ARG base_image=ghcr.io/nvidia/cuda-quantum-devdeps:ext-cu12.0-gcc11-main
 FROM $base_image
 
 ENV CUDAQ_REPO_ROOT=/workspaces/cuda-quantum
diff --git a/docker/build/devdeps.ext.Dockerfile b/docker/build/devdeps.ext.Dockerfile
index bc810d710da..3f6d3286a86 100644
--- a/docker/build/devdeps.ext.Dockerfile
+++ b/docker/build/devdeps.ext.Dockerfile
@@ -18,7 +18,7 @@
 
 ARG cuda_version=11.8
 ARG base_image=ghcr.io/nvidia/cuda-quantum-devdeps:gcc11-main
-ARG ompidev_image=ghcr.io/nvidia/cuda-quantum-devdeps:cu11-ompi-main
+ARG ompidev_image=ghcr.io/nvidia/cuda-quantum-devdeps:cu12-ompi-main
 FROM $ompidev_image AS ompibuild
 ARG cuda_version
 RUN if [ -z "${cuda_version}" ]; then \
diff --git a/docker/build/devdeps.ompi.Dockerfile b/docker/build/devdeps.ompi.Dockerfile
index 1aba3d2bd2f..11bb943c976 100644
--- a/docker/build/devdeps.ompi.Dockerfile
+++ b/docker/build/devdeps.ompi.Dockerfile
@@ -15,7 +15,7 @@
 # Must be built from the repo root with:
 #   docker build -t ghcr.io/nvidia/cuda-quantum-devdeps:ompi -f docker/build/devdeps.ompi.Dockerfile .
 
-ARG cuda_version=11.8
+ARG cuda_version=12.0
 FROM nvidia/cuda:${cuda_version}.0-devel-ubuntu22.04
 SHELL ["/bin/bash", "-c"]
 ARG DEBIAN_FRONTEND=noninteractive
diff --git a/docker/release/cudaq.Dockerfile b/docker/release/cudaq.Dockerfile
index 187fe19e5e0..18e261a1e69 100644
--- a/docker/release/cudaq.Dockerfile
+++ b/docker/release/cudaq.Dockerfile
@@ -16,7 +16,7 @@
 #
 # Usage:
 # Must be built from the repo root with:
-#   docker build -t nvcr.io/nvidia/nightly/cuda-quantum:latest-base -f docker/release/cudaq.Dockerfile .
+#   docker build -t nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest-base -f docker/release/cudaq.Dockerfile .
 # 
 # The build argument cudaqdev_image defines the CUDA-Q dev image that contains the CUDA
 # Quantum build. This Dockerfile copies the built components into the base_image. The specified
diff --git a/docker/release/cudaq.ext.Dockerfile b/docker/release/cudaq.ext.Dockerfile
index 185ec4d35fc..6aadcf9e0f2 100644
--- a/docker/release/cudaq.ext.Dockerfile
+++ b/docker/release/cudaq.ext.Dockerfile
@@ -6,7 +6,7 @@
 # the terms of the Apache License 2.0 which accompanies this distribution.     #
 # ============================================================================ #
 
-ARG base_image=nvcr.io/nvidia/nightly/cuda-quantum:cu11-latest-base
+ARG base_image=nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest-base
 FROM $base_image
 
 USER root
diff --git a/docker/release/cudaq.nvqc.Dockerfile b/docker/release/cudaq.nvqc.Dockerfile
index 5d4a1bc800f..e5d3a9fcf5a 100644
--- a/docker/release/cudaq.nvqc.Dockerfile
+++ b/docker/release/cudaq.nvqc.Dockerfile
@@ -13,7 +13,7 @@
 #   DOCKER_BUILDKIT=1 docker build -f docker/release/cudaq.nvqc.Dockerfile . --output out
 
 # Base image is CUDA-Q image 
-ARG base_image=nvcr.io/nvidia/nightly/cuda-quantum:latest
+ARG base_image=nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest
 FROM $base_image AS nvcf_image
 
 # Run the tar command and then uncomment ADD cudaq.tar.gz ... in order to
diff --git a/docker/release/cudaq.wheel.Dockerfile b/docker/release/cudaq.wheel.Dockerfile
index 8e7717de006..c209e39bc0d 100644
--- a/docker/release/cudaq.wheel.Dockerfile
+++ b/docker/release/cudaq.wheel.Dockerfile
@@ -18,7 +18,7 @@
 # - https://github.com/numpy/numpy/blob/main/pyproject.toml, and 
 # - https://github.com/numpy/numpy/blob/main/.github/workflows/wheels.yml
 
-ARG base_image=ghcr.io/nvidia/cuda-quantum-devdeps:manylinux-amd64-cu11.8-gcc11-main
+ARG base_image=ghcr.io/nvidia/cuda-quantum-devdeps:manylinux-amd64-cu12.0-gcc11-main
 FROM $base_image AS wheelbuild
 
 ARG release_version=
@@ -39,9 +39,10 @@ RUN echo "Building MLIR bindings for python${python_version}" && \
 
 # Patch the pyproject.toml file to change the CUDA version if needed
 RUN sed -i "s/README.md.in/README.md/g" cuda-quantum/pyproject.toml && \
-    if [ "${CUDA_VERSION#12.}" != "${CUDA_VERSION}" ]; then \
-        sed -i "s/-cu11/-cu12/g" cuda-quantum/pyproject.toml && \
-        sed -i -E "s/(nvidia-cublas-cu[0-9]* ~= )[0-9\.]*/\1${CUDA_VERSION}/g" cuda-quantum/pyproject.toml; \
+    if [ "${CUDA_VERSION#11.}" != "${CUDA_VERSION}" ]; then \
+        cublas_version=11.11 && \
+        sed -i "s/-cu12/-cu11/g" cuda-quantum/pyproject.toml && \
+        sed -i -E "s/(nvidia-cublas-cu[0-9]* ~= )[0-9\.]*/\1${cublas_version}/g" cuda-quantum/pyproject.toml && \
         sed -i -E "s/(nvidia-cuda-runtime-cu[0-9]* ~= )[0-9\.]*/\1${CUDA_VERSION}/g" cuda-quantum/pyproject.toml; \
     fi
 
diff --git a/docker/release/installer.Dockerfile b/docker/release/installer.Dockerfile
index 9fe45947907..b62f5ed8f8f 100644
--- a/docker/release/installer.Dockerfile
+++ b/docker/release/installer.Dockerfile
@@ -14,7 +14,7 @@
 # Must be built from the repo root with:
 #   DOCKER_BUILDKIT=1 docker build -f docker/release/installer.Dockerfile . --output out
 
-ARG base_image=ghcr.io/nvidia/cuda-quantum-assets:amd64-cu11-llvm-main
+ARG base_image=ghcr.io/nvidia/cuda-quantum-assets:amd64-cu12-llvm-main
 ARG additional_components=none
 
 FROM $base_image AS additional_components_none
diff --git a/docker/test/installer/linux.Dockerfile b/docker/test/installer/linux.Dockerfile
index 445e2add891..f752567a8c3 100644
--- a/docker/test/installer/linux.Dockerfile
+++ b/docker/test/installer/linux.Dockerfile
@@ -18,7 +18,9 @@ ARG cudart_version
 
 ## [Prerequisites]
 ADD docker/test/installer/runtime_dependencies.sh /runtime_dependencies.sh
-RUN CUDA_DISTRIBUTION=rhel9 bash runtime_dependencies.sh ${base_image_mpibuild}
+RUN CUDA_DISTRIBUTION=rhel9 \
+    CUDART_VERSION=${cudart_version} \
+    bash runtime_dependencies.sh ${base_image_mpibuild}
 RUN dnf install -y --nobest --setopt=install_weak_deps=False \
         autoconf libtool flex make wget
 
diff --git a/docker/test/installer/runtime_dependencies.sh b/docker/test/installer/runtime_dependencies.sh
index bae4173ef2d..34a3f63f0b7 100644
--- a/docker/test/installer/runtime_dependencies.sh
+++ b/docker/test/installer/runtime_dependencies.sh
@@ -33,7 +33,7 @@ esac
 
 CUDA_DOWNLOAD_URL=https://developer.download.nvidia.com/compute/cuda/repos
 CUDA_ARCH_FOLDER=$([ "$(uname -m)" == "aarch64" ] && echo sbsa || echo x86_64)
-CUDA_VERSION_SUFFIX=$(echo ${CUDART_VERSION:-'11.8'} | tr . -)
+CUDA_VERSION_SUFFIX=$(echo ${CUDART_VERSION:-'12.0'} | tr . -)
 CUDA_PACKAGES=$(echo "cuda-cudart libcusolver libcublas" | sed "s/[^ ]*/&-${CUDA_VERSION_SUFFIX} /g")
 if [ $(echo ${CUDART_VERSION} | cut -d . -f1) -gt 11 ]; then 
     CUDA_PACKAGES+=" libnvjitlink-${CUDA_VERSION_SUFFIX}"
diff --git a/docker/test/wheels/debian.Dockerfile b/docker/test/wheels/debian.Dockerfile
index 2a7035e9e17..dc4bc121975 100644
--- a/docker/test/wheels/debian.Dockerfile
+++ b/docker/test/wheels/debian.Dockerfile
@@ -12,7 +12,7 @@ SHELL ["/bin/bash", "-c"]
 
 ARG python_version=3.11
 ARG pip_install_flags=""
-ARG preinstalled_modules="numpy pytest nvidia-cublas-cu11"
+ARG preinstalled_modules="numpy pytest nvidia-cublas-cu12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -28,7 +28,7 @@ RUN if [ -n "$preinstalled_modules" ]; then \
     fi
 
 ARG optional_dependencies=
-ARG cuda_quantum_wheel=cuda_quantum_cu11-0.0.0-cp311-cp311-manylinux_2_28_x86_64.whl
+ARG cuda_quantum_wheel=cuda_quantum_cu12-0.0.0-cp311-cp311-manylinux_2_28_x86_64.whl
 COPY $cuda_quantum_wheel /tmp/$cuda_quantum_wheel
 COPY docs/sphinx/examples/python /tmp/examples/
 COPY docs/sphinx/applications/python /tmp/applications/
diff --git a/docker/test/wheels/fedora.Dockerfile b/docker/test/wheels/fedora.Dockerfile
index f35b244561c..d6b10bad1a3 100644
--- a/docker/test/wheels/fedora.Dockerfile
+++ b/docker/test/wheels/fedora.Dockerfile
@@ -11,7 +11,7 @@ FROM ${base_image}
 
 ARG python_version=3.10
 ARG pip_install_flags="--user"
-ARG preinstalled_modules="numpy pytest nvidia-cublas-cu11"
+ARG preinstalled_modules="numpy pytest nvidia-cublas-cu12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -26,7 +26,7 @@ RUN if [ -n "$preinstalled_modules" ]; then \
     fi
 
 ARG optional_dependencies=
-ARG cuda_quantum_wheel=cuda_quantum_cu11-0.0.0-cp310-cp310-manylinux_2_28_x86_64.whl
+ARG cuda_quantum_wheel=cuda_quantum_cu12-0.0.0-cp310-cp310-manylinux_2_28_x86_64.whl
 COPY $cuda_quantum_wheel /tmp/$cuda_quantum_wheel
 COPY docs/sphinx/examples/python /tmp/examples/
 COPY docs/sphinx/applications/python /tmp/applications/
diff --git a/docker/test/wheels/opensuse.Dockerfile b/docker/test/wheels/opensuse.Dockerfile
index b6e61fcebf7..5f75be945c5 100644
--- a/docker/test/wheels/opensuse.Dockerfile
+++ b/docker/test/wheels/opensuse.Dockerfile
@@ -11,7 +11,7 @@ FROM ${base_image}
 
 ARG python_version=3.11
 ARG pip_install_flags="--user"
-ARG preinstalled_modules="numpy pytest nvidia-cublas-cu11"
+ARG preinstalled_modules="numpy pytest nvidia-cublas-cu12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN zypper clean --all && zypper ref && zypper --non-interactive up --no-recommends \
@@ -23,7 +23,7 @@ RUN if [ -n "$preinstalled_modules" ]; then \
     fi
 
 ARG optional_dependencies=
-ARG cuda_quantum_wheel=cuda_quantum_cu11-0.0.0-cp39-cp39-manylinux_2_28_x86_64.whl
+ARG cuda_quantum_wheel=cuda_quantum_cu12-0.0.0-cp39-cp39-manylinux_2_28_x86_64.whl
 COPY $cuda_quantum_wheel /tmp/$cuda_quantum_wheel
 COPY docs/sphinx/examples/python /tmp/examples/
 COPY docs/sphinx/applications/python /tmp/applications/
diff --git a/docker/test/wheels/redhat.Dockerfile b/docker/test/wheels/redhat.Dockerfile
index 918b8d82905..d9b577fcb62 100644
--- a/docker/test/wheels/redhat.Dockerfile
+++ b/docker/test/wheels/redhat.Dockerfile
@@ -11,7 +11,7 @@ FROM ${base_image}
 
 ARG python_version=3.11
 ARG pip_install_flags="--user"
-ARG preinstalled_modules="numpy pytest nvidia-cublas-cu11"
+ARG preinstalled_modules="numpy pytest nvidia-cublas-cu12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN dnf install -y --nobest --setopt=install_weak_deps=False \
@@ -22,7 +22,7 @@ RUN if [ -n "$preinstalled_modules" ]; then \
     fi
 
 ARG optional_dependencies=
-ARG cuda_quantum_wheel=cuda_quantum_cu11-0.0.0-cp311-cp311-manylinux_2_28_x86_64.whl
+ARG cuda_quantum_wheel=cuda_quantum_cu12-0.0.0-cp311-cp311-manylinux_2_28_x86_64.whl
 COPY $cuda_quantum_wheel /tmp/$cuda_quantum_wheel
 COPY docs/sphinx/examples/python /tmp/examples/
 COPY docs/sphinx/applications/python /tmp/applications/
diff --git a/docker/test/wheels/ubuntu.Dockerfile b/docker/test/wheels/ubuntu.Dockerfile
index f5cd61d42e0..6d631aec872 100644
--- a/docker/test/wheels/ubuntu.Dockerfile
+++ b/docker/test/wheels/ubuntu.Dockerfile
@@ -11,7 +11,7 @@ FROM ${base_image}
 
 ARG python_version=3.10
 ARG pip_install_flags="--user"
-ARG preinstalled_modules="numpy pytest nvidia-cublas-cu11"
+ARG preinstalled_modules="numpy pytest nvidia-cublas-cu12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -27,7 +27,7 @@ RUN if [ -n "$preinstalled_modules" ]; then \
     fi
 
 ARG optional_dependencies=
-ARG cuda_quantum_wheel=cuda_quantum_cu11-0.0.0-cp310-cp310-manylinux_2_28_x86_64.whl
+ARG cuda_quantum_wheel=cuda_quantum_cu12-0.0.0-cp310-cp310-manylinux_2_28_x86_64.whl
 COPY $cuda_quantum_wheel /tmp/$cuda_quantum_wheel
 COPY docs/sphinx/examples/python /tmp/examples/
 COPY docs/sphinx/applications/python /tmp/applications/
diff --git a/docs/sphinx/using/backends/nvqc.rst b/docs/sphinx/using/backends/nvqc.rst
index 05ff7066970..7586d08719a 100644
--- a/docs/sphinx/using/backends/nvqc.rst
+++ b/docs/sphinx/using/backends/nvqc.rst
@@ -40,7 +40,7 @@ By selecting the `nvqc` target, the quantum circuit simulation will run on NVQC
 
         ================ NVQC Device Info ================
         GPU Device Name: "NVIDIA H100 80GB HBM3"
-        CUDA Driver Version / Runtime Version: 12.2 / 11.8
+        CUDA Driver Version / Runtime Version: 12.2 / 12.0
         Total global memory (GB): 79.1
         Memory Clock Rate (MHz): 2619.000
         GPU Clock Rate (MHz): 1980.000
@@ -64,7 +64,7 @@ By selecting the `nvqc` target, the quantum circuit simulation will run on NVQC
 
         ================ NVQC Device Info ================
         GPU Device Name: "NVIDIA H100 80GB HBM3"
-        CUDA Driver Version / Runtime Version: 12.2 / 11.8
+        CUDA Driver Version / Runtime Version: 12.2 / 12.0
         Total global memory (GB): 79.1
         Memory Clock Rate (MHz): 2619.000
         GPU Clock Rate (MHz): 1980.000
diff --git a/docs/sphinx/using/backends/platform.rst b/docs/sphinx/using/backends/platform.rst
index 18753617c97..ad395ebc558 100644
--- a/docs/sphinx/using/backends/platform.rst
+++ b/docs/sphinx/using/backends/platform.rst
@@ -196,7 +196,7 @@ For instance, on a machine with 8 NVIDIA GPUs, one may wish to partition those G
      .. code-block:: bash
          
          # Use cudaq-qpud.py wrapper script to automatically find dependencies for the Python wheel configuration.
-         cudaq_location=`python3 -m pip show cuda-quantum | grep -e 'Location: .*$'`
+         cudaq_location=`python3 -m pip show cudaq | grep -e 'Location: .*$'`
          qpud_py="${cudaq_location#Location: }/bin/cudaq-qpud.py"
          CUDA_VISIBLE_DEVICES=0,1 mpiexec -np 2 python3 "$qpud_py" --port <QPU 1 TCP/IP port number>
          CUDA_VISIBLE_DEVICES=2,3 mpiexec -np 2 python3 "$qpud_py" --port <QPU 2 TCP/IP port number>
diff --git a/docs/sphinx/using/install/data_center_install.rst b/docs/sphinx/using/install/data_center_install.rst
index b73cc946408..8b0fb1a0d09 100644
--- a/docs/sphinx/using/install/data_center_install.rst
+++ b/docs/sphinx/using/install/data_center_install.rst
@@ -52,9 +52,9 @@ will be installed and used.
   with the `AlmaLinux 8 image <https://hub.docker.com/u/almalinux>`__ that
   serves as the base image for the `manylinux_2_28 image
   <https://github.com/pypa/manylinux>`__, and should work for the operating
-  systems CentOS 8, Debian 11 and 12, Fedora 38, OpenSUSE/SLED/SLES 15.5, RHEL 8
-  and 9, Rocky 8 and 9, and Ubuntu 22.04. Other operating systems may work, but
-  have not been tested.
+  systems CentOS 8, Debian 11 and 12, Fedora 38 and 39, OpenSUSE/SLED/SLES 15.5
+  and 15.6, RHEL 8 and 9, Rocky 8 and 9, and Ubuntu 24.04 and 22.04. Other 
+  operating systems may work, but have not been tested.
 - `Bash <https://www.gnu.org/software/bash/>`__ shell. The CUDA-Q 
   build, install and run scripts expect to use `/bin/bash`.
 - `GNU C library <https://www.gnu.org/software/libc/>`__. 
@@ -62,8 +62,8 @@ will be installed and used.
   or newer than the version on the build system. Our own builds
   use version 2.28.
 - CPU with either x86-64 (x86-64-v3 architecture and newer) or ARM64
-  (ARM v8-A architecture and newer). Other architectures may work but are not tested and may require
-  adjustments to the build instructions.
+  (ARM v8-A architecture and newer). Other architectures may work but are not
+  tested and may require adjustments to the build instructions.
 - Needed **only on the host** system: NVIDIA GPU with Volta, Turing, Ampere, Ada, or
   Hopper architecture and `Compute Capability
   <https://developer.nvidia.com/cuda-gpus>`__ 7+. Make sure you have the latest
@@ -86,7 +86,7 @@ In addition to the prerequisites listed above, you will need to install the
 following prerequisites in your build environment prior to proceeding with 
 the build as described in the subsequent sections:
 
-- Python version 3.8 or newer: If you intend to build CUDA-Q with Python
+- Python version 3.10 or newer: If you intend to build CUDA-Q with Python
   support, make sure the Python version on the build system matches the version
   on the host system. If you intend to only build the C++ support for
   CUDA-Q, the Python interpreter is required only for some of the 
@@ -149,7 +149,7 @@ CUDA
 
 Building CUDA-Q requires a full installation of the CUDA toolkit.
 **You can install the CUDA toolkit and use the CUDA compiler without having a GPU.**
-The instructions are tested using version 11.8, but any CUDA 11 or 12 version
+The instructions are tested using version 11.8 and 12.0, but other CUDA 11 or 12 versions
 should work, as long as the CUDA runtime version on the host system matches the 
 CUDA version used for the build, and the installed driver on the host 
 system supports that CUDA version. We recommend using the latest CUDA version
@@ -160,7 +160,7 @@ following the installation guide for your platform in the online documentation
 linked on that page.
 
 Within the tested AlmaLinux 8 environment, for example, the following commands
-install CUDA 11.8:
+install CUDA 12.0:
 
 .. literalinclude:: ../../../../scripts/configure_build.sh
     :language: bash
@@ -247,12 +247,17 @@ Python-specific tools:
   The package name is usually your python version followed by either a `-dev` or `-devel` suffix.
   If you are using a `Conda environment <https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-python.html>`__,
   the necessary headers should already be installed.
-- Pip package manager: Make sure the `pip` module is enable for your Python version.
+- Pip package manager: Make sure the `pip` module is enable for your Python version, and that your `pip` version is 24 or newer.
   We refer to the Python `documentation <https://pip.pypa.io/en/stable/installation/>`__ for
   more information about installing/enabling `pip`.
 - Python modules: Install the additional modules `numpy`, `build`, `auditwheel`, and `patchelf` for your
   Python version, e.g. `python3 -m pip install numpy build auditwheel patchelf`.
 
+.. note::
+
+  The wheel build by default is configured to depend on CUDA 12. To build a wheel for CUDA 11, 
+  you need to adjust the dependencies and project name in the `pyproject.toml` file. 
+
 From within the folder where you cloned the CUDA-Q repository, run the following
 command to build the CUDA-Q Python wheel:
 
@@ -340,9 +345,6 @@ Make sure your host system satisfies the `Prerequisites`_ listed above.
   via package manager (usually the package name is called something like `glibc-devel`
   or `libc6-devel`). These headers are also included with any installation of GCC.
 
-To use CUDA-Q with Python, you should have a working
-Python installation on the host system, including the `pip` package manager.
-
 If you followed the instructions for building the 
 :ref:`CUDA-Q Python wheel <cudaq-python-from-source>`,
 copy the built `.whl` file to the host system, and install it using `pip`; e.g.
@@ -351,9 +353,11 @@ copy the built `.whl` file to the host system, and install it using `pip`; e.g.
 
     pip install cuda_quantum*.whl
 
+.. TODO: update pypi links throughout the docs
+
 To install the necessary CUDA and MPI dependencies for some of the components, 
 you can either follow the instructions on `PyPI.org <https://pypi.org/project/cuda-quantum/>`__, 
-replacing `pip install cuda-quantum` with the command above, or you can follow the
+replacing `pip install cudaq` with the command above, or you can follow the
 instructions in the remaining sections of this document to customize and better
 optimize them for your host system.
 
diff --git a/docs/sphinx/using/install/local_installation.rst b/docs/sphinx/using/install/local_installation.rst
index 695dc6de720..737ca2a3366 100644
--- a/docs/sphinx/using/install/local_installation.rst
+++ b/docs/sphinx/using/install/local_installation.rst
@@ -37,11 +37,11 @@ Docker images for all CUDA-Q releases are available on the `NGC Container Regist
 In addition to publishing `stable releases <https://catalog.ngc.nvidia.com/orgs/nvidia/teams/quantum/containers/cuda-quantum/tags>`__, 
 we also publish Docker images whenever we update certain branches on our `GitHub repository <https://github.com/NVIDIA/cuda-quantum>`_.
 These images are published in our `nightly channel on NGC <https://catalog.ngc.nvidia.com/orgs/nvidia/teams/nightly/containers/cuda-quantum/tags>`__.
-To download the latest version on the main branch of our GitHub repository, for example, use the command
+To download the latest version on the main branch of our GitHub repository, built to work with CUDA 12, for example, use the command
 
 .. code-block:: console
 
-    docker pull nvcr.io/nvidia/nightly/cuda-quantum:latest
+    docker pull nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest
 
 .. _NGC Container Registry: https://catalog.ngc.nvidia.com/orgs/nvidia/teams/quantum/containers/cuda-quantum
 
@@ -54,7 +54,7 @@ Once you have downloaded an image, the container can be run using the command
 
 .. code-block:: console
 
-    docker run -it --name cuda-quantum nvcr.io/nvidia/nightly/cuda-quantum:latest
+    docker run -it --name cuda-quantum nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest
 
 Replace the image name and/or tag in the command above, if necessary, with the one you want to use.
 This will give you terminal access to the created container. To enable support 
@@ -63,7 +63,7 @@ the container, for example:
 
 .. code-block:: console
 
-    docker run -it --gpus all --name cuda-quantum nvcr.io/nvidia/nightly/cuda-quantum:latest
+    docker run -it --gpus all --name cuda-quantum nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest
 
 .. note:: 
 
@@ -89,7 +89,7 @@ You can then launch the container and connect to it via SSH by executing the fol
 
 .. code-block:: console
 
-    docker run -itd --gpus all --name cuda-quantum -p 2222:22 nvcr.io/nvidia/nightly/cuda-quantum:latest
+    docker run -itd --gpus all --name cuda-quantum -p 2222:22 nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest
     docker exec cuda-quantum bash -c "sudo apt-get install -y --no-install-recommends openssh-server"
     docker exec cuda-quantum bash -c "sudo sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config"
     docker cp ~/.ssh/id_rsa.pub cuda-quantum:/home/cudaq/.ssh/authorized_keys
@@ -121,7 +121,7 @@ Once you have singularity installed, create a file `cuda-quantum.def` with the f
 .. code-block:: console
 
     Bootstrap: docker
-    From: nvcr.io/nvidia/nightly/cuda-quantum:latest
+    From: nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest
 
     %runscript
         mount devpts /dev/pts -t devpts
@@ -559,7 +559,7 @@ Confirm that you can submit a job with the command
 
     ngc base-command job run \
       --name Job-001 --total-runtime 60s \
-      --image nvcr.io/nvidia/nightly/cuda-quantum:latest --result /results \
+      --image nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest --result /results \
       --ace <ace_name> --instance <instance_name> \
       --commandline 'echo "Hello from DGX Cloud!"'
 
@@ -595,7 +595,7 @@ running on DGX Cloud:
 
     ngc base-command job run \
       --name Job-interactive-001 --total-runtime 600s \
-      --image nvcr.io/nvidia/nightly/cuda-quantum:latest --result /results \
+      --image nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest --result /results \
       --ace <ace_name> --instance <instance_name> \
       --port 8888 --commandline 'jupyter-lab-setup <my-custom-token> --port=8888'
 
@@ -624,7 +624,7 @@ or the `VS Code Web UI <https://vscode.dev/>`__, running on DGX Cloud:
 
     ngc base-command job run \
       --name Job-interactive-001 --total-runtime 600s \
-      --image nvcr.io/nvidia/nightly/cuda-quantum:latest --result /results \
+      --image nvcr.io/nvidia/nightly/cuda-quantum:cu12-latest --result /results \
       --ace <ace_name> --instance <instance_name> \
       --commandline 'vscode-setup tunnel --name cuda-quantum-dgx --accept-server-license-terms'
 
@@ -672,13 +672,15 @@ Note that the image does not contain all development dependencies for CUDA, such
 
 .. code-block:: console
 
-    sudo apt-get install cuda-toolkit-11.8
+    sudo apt-get install cuda-toolkit-12.0
 
-inside the container. Most Python packages that use GPU-acceleration, such as for example `CuPy <https://cupy.dev>`__, require an existing CUDA installation. After installing the `cuda-toolkit-11.8` you can install CuPy with the command
+inside the container. Make sure the toolkit version you install matches the CUDA runtime installation in the container.
+Most Python packages that use GPU-acceleration, such as for example `CuPy <https://cupy.dev>`__, require an existing CUDA installation. 
+After installing the `cuda-toolkit-12.0` you can install CuPy for CUDA 12 with the command
 
 .. code-block:: console
 
-    python3 -m pip install cupy-cuda11x
+    python3 -m pip install cupy-cuda12x
 
 .. _cuda-dependencies-prebuilt-binaries:
 
@@ -686,7 +688,7 @@ Installing Pre-built Binaries
 ++++++++++++++++++++++++++++++++++++
 
 If you installed pre-built binaries for CUDA-Q, you will need to install 
-the necessary CUDA 11 runtime libraries to use GPU-acceleration in CUDA-Q. 
+the necessary CUDA runtime libraries to use GPU-acceleration in CUDA-Q. 
 If you prefer to only install the minimal set of runtime libraries, the following 
 commands, for example, install the necessary packages for RHEL 8:
 
@@ -698,11 +700,12 @@ commands, for example, install the necessary packages for RHEL 8:
 
 More detailed instructions for your platform can be found in the online documentation
 linked for that `CUDA version <https://developer.nvidia.com/cuda-toolkit-archive>`__. 
-Please make sure to install CUDA version 11.8, and confirm that your 
+Please make sure to install CUDA version 11.8 or newer, and confirm that your 
 `GPU driver <https://www.nvidia.com/download/index.aspx>`__ supports that version.
 While the above packages are sufficient to use GPU-acceleration within CUDA-Q, 
-we recommend installing the complete CUDA toolkit (`cuda-toolkit-11-8`) that also 
-includes the `nvcc` compiler.
+we recommend installing the complete CUDA toolkit (`cuda-toolkit-12-0`) that also 
+includes the `nvcc` compiler. A separate CUDA-Q installer is available for CUDA 11, 
+built against version 11.8, and for CUDA 12, built against version 12.0.
 
 .. _distributed-computing-with-mpi:
 
@@ -734,7 +737,7 @@ MPI calls via CUDA-Q API for C++ and Python will be delegated to the currently a
     If you installed CUDA-Q using the `installer <install-prebuilt-binaries>`, or if you are using the CUDA-Q 
     container image, this variable should already be defined. If you installed the CUDA-Q 
     `Python wheels <install-python-wheels>`, set this variable to the directory listed under "Location" when you run the 
-    command `pip show cuda-quantum`.
+    command `pip show cudaq`.
 
   - Set the environment variable `MPI_PATH` to the location of your MPI installation. In particular, `${MPI_PATH}/include` 
     is expected to contain the `mpi.h` header and `${MPI_PATH}/lib64` or `${MPI_PATH}/lib` is expected to contain `libmpi.so`.
@@ -777,7 +780,16 @@ by running the command
 
 .. code-block:: console
 
-    python3 -m pip install --upgrade cuda-quantum
+    python3 -m pip install --upgrade cudaq
+
+.. note::
+
+  Please check if you have an existing installation of the `cuda-quantum`, 
+  `cudaq-quantum-cu11`, or `cuda-quantum-cu12` package, 
+  and uninstall it prior to installing `cudaq`. The `cudaq` package supersedes the
+  `cuda-quantum` package and will install a suitable binary distribution (either 
+  `cuda-quantum-cu11` or `cuda-quantum-cu12`) for your system. Multiple versions 
+  of a CUDA-Q binary distribution will conflict with each other and not work properly.
 
 If you previously installed the CUDA-Q pre-built binaries, you should first uninstall your 
 current CUDA-Q installation before installing the new version using the installer. 
@@ -818,9 +830,9 @@ The following table summarizes the required components.
     * - Operating System
       - Linux
     * - Tested Distributions
-      - CentOS 8; Debian 11, 12; Fedora 38; OpenSUSE/SLED/SLES 15.5; RHEL 8, 9; Rocky 8, 9; Ubuntu 22.04
+      - CentOS 8; Debian 11, 12; Fedora 38, 39; OpenSUSE/SLED/SLES 15.5, 15.6; RHEL 8, 9; Rocky 8, 9; Ubuntu 22.04, 24.04
     * - Python versions
-      - 3.8+
+      - 3.10+
 
 .. list-table:: Requirements for GPU Simulation
     :widths: 30 50
diff --git a/docs/sphinx/using/quick_start.rst b/docs/sphinx/using/quick_start.rst
index 0e88f40ea4a..d020dbbb19f 100644
--- a/docs/sphinx/using/quick_start.rst
+++ b/docs/sphinx/using/quick_start.rst
@@ -35,14 +35,15 @@ Install CUDA-Q
 
    To develop CUDA-Q applications using C++, please make sure you have a C++ toolchain installed
    that supports C++20, for example `g++` version 11 or newer.
-   Download the `install_cuda_quantum` file for your processor architecture from
-   the assets of the respective `GitHub release <https://github.com/NVIDIA/cuda-quantum/releases>`__; that is the file with the `aarch64` extension for ARM processors, and the one with `x86_64` for, e.g., Intel and AMD processors.
+   Download the `install_cuda_quantum` file for your processor architecture and CUDA version (`_cu11` suffix for CUDA 11 and `_cu12` suffix for CUDA 12) 
+   from the assets of the respective `GitHub release <https://github.com/NVIDIA/cuda-quantum/releases>`__; 
+   hat is the file with the `aarch64` extension for ARM processors, and the one with `x86_64` for, e.g., Intel and AMD processors.
 
    To install CUDA-Q, execute the commands
 
    .. code-block:: bash
 
-      sudo -E bash install_cuda_quantum.$(uname -m) --accept 
+      sudo -E bash install_cuda_quantum*.$(uname -m) --accept 
       . /etc/profile
 
    If you have an NVIDIA GPU, please also install the `CUDA Toolkit <https://developer.nvidia.com/cuda-downloads>`__ to enable GPU-acceleration within CUDA-Q.
diff --git a/pyproject.toml b/pyproject.toml
index bd01bd68f81..57bdc2c7e61 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@
 # ============================================================================ #
 
 [project]
-name = "cuda-quantum-cu11"
+name = "cuda-quantum-cu12"
 dynamic = ["version"]
 keywords = [ "cudaq", "cuda-quantum", "cuda", "quantum", "quantum computing", "nvidia", "high-performance computing" ]
 description="Python bindings for the CUDA-Q toolkit for heterogeneous quantum-classical workflows."
@@ -18,12 +18,12 @@ requires-python = ">=3.10"
 license = { file="LICENSE" }
 dependencies = [
   'astpretty ~= 3.0',
-  'cuquantum-cu11 ~= 24.08',
+  'cuquantum-cu12 ~= 24.08',
   'numpy >= 1.24',
   'requests >= 2.31',
-  'nvidia-cublas-cu11 ~= 11.11; platform_machine == "x86_64"',
-  'nvidia-cuda-runtime-cu11 ~= 11.8; platform_machine == "x86_64"',
-  'nvidia-cusolver-cu11 ~= 11.4; platform_machine == "x86_64"'
+  'nvidia-cublas-cu12 ~= 12.0; platform_machine == "x86_64"',
+  'nvidia-cuda-runtime-cu12 ~= 12.0; platform_machine == "x86_64"',
+  'nvidia-cusolver-cu12 ~= 11.4; platform_machine == "x86_64"'
 ]
 classifiers = [
     'Intended Audience :: Science/Research',
diff --git a/python/README.md.in b/python/README.md.in
index 3b061f6a3a8..d092ca32c37 100644
--- a/python/README.md.in
+++ b/python/README.md.in
@@ -36,7 +36,11 @@ ${{ package_name }}`. Please make sure your `pip` version is >= 24.0.
 If you have an NVIDIA GPU on your host system, you will be
 able to use it without any further installation steps.
 
-However, if you want to perform multi-GPU simulations, or if you are using
+> **Important:** 
+> Please check if you have an existing installation of the `cuda-quantum`, `cudaq-quantum-cu11`, or `cuda-quantum-cu12` package, and uninstall it prior to installation. Different CUDA-Q binary distributions may conflict with each other causing issues.
+
+
+If you want to perform multi-GPU simulations, or if you are using
 `aarch64`/`arm64` processors, additional components must be installed. We
 recommend using [Conda](https://docs.conda.io/en/latest/) to do so. If you are
 not already using Conda, you can install a minimal version following the
diff --git a/python/tests/remote/test_remote_platform.py b/python/tests/remote/test_remote_platform.py
index c1ca9b258bc..1b3343c2f30 100644
--- a/python/tests/remote/test_remote_platform.py
+++ b/python/tests/remote/test_remote_platform.py
@@ -14,11 +14,6 @@
 
 num_qpus = 3
 
-## [PYTHON_VERSION_FIX]
-skipIfPythonLessThan39 = pytest.mark.skipif(
-    sys.version_info < (3, 9),
-    reason="This test is crashing in CI on Python 3.8 (amd64, fedora)")
-
 
 def assert_close(want, got, tolerance=1.e-5) -> bool:
     return abs(want - got) < tolerance
@@ -98,8 +93,6 @@ def check_observe(entity):
     assert abs(res.expectation() - expected_energy) < energy_tol
 
 
-## Ref: https://github.com/NVIDIA/cuda-quantum/issues/2204
-@skipIfPythonLessThan39
 def test_observe():
     # Create the parameterized ansatz
     kernel, theta = cudaq.make_kernel(float)
diff --git a/scripts/configure_build.sh b/scripts/configure_build.sh
index 3d161f930a6..0d5d1952742 100644
--- a/scripts/configure_build.sh
+++ b/scripts/configure_build.sh
@@ -26,7 +26,7 @@ if [ "$1" == "install-cuda" ]; then
     CUDA_ARCH_FOLDER=$([ "$(uname -m)" == "aarch64" ] && echo sbsa || echo x86_64)
 
 # [>CUDAInstall]
-    CUDA_VERSION=${CUDA_VERSION:-11.8}
+    CUDA_VERSION=${CUDA_VERSION:-12.0}
     CUDA_DOWNLOAD_URL=https://developer.download.nvidia.com/compute/cuda/repos
     # Go to the url above, set the variables below to a suitable distribution
     # and subfolder for your platform, and uncomment the line below.
@@ -43,7 +43,7 @@ if [ "$1" == "install-cudart" ]; then
     CUDA_ARCH_FOLDER=$([ "$(uname -m)" == "aarch64" ] && echo sbsa || echo x86_64)
 
 # [>CUDARTInstall]
-    CUDA_VERSION=${CUDA_VERSION:-11.8}
+    CUDA_VERSION=${CUDA_VERSION:-12.0}
     CUDA_DOWNLOAD_URL=https://developer.download.nvidia.com/compute/cuda/repos
     # Go to the url above, set the variables below to a suitable distribution
     # and subfolder for your platform, and uncomment the line below.
@@ -63,7 +63,7 @@ if [ "$1" == "install-cudart" ]; then
 fi
 
 if [ "$1" == "install-cuquantum" ]; then
-    CUDA_VERSION=${CUDA_VERSION:-11.8}
+    CUDA_VERSION=${CUDA_VERSION:-12.0}
     CUDA_ARCH_FOLDER=$([ "$(uname -m)" == "aarch64" ] && echo sbsa || echo x86_64)
 
 # [>cuQuantumInstall]
@@ -79,7 +79,7 @@ if [ "$1" == "install-cuquantum" ]; then
 fi
 
 if [ "$1" == "install-cutensor" ]; then
-    CUDA_VERSION=${CUDA_VERSION:-11.8}
+    CUDA_VERSION=${CUDA_VERSION:-12.0}
     CUDA_ARCH_FOLDER=$([ "$(uname -m)" == "aarch64" ] && echo sbsa || echo x86_64)
 
 # [>cuTensorInstall]