diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a031425712f..df119f19358 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -75,6 +75,13 @@ jobs:
       name: ${{ matrix.name }}
       jobs: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.WORKFLOW)[ matrix.name ]) }}
 
+#   verify-devcontainers:
+#     name: Verify Dev Containers
+#     permissions:
+#       id-token: write
+#       contents: read
+#     uses: ./.github/workflows/verify-devcontainers.yml
+
   # This job is the final job that runs after all other jobs and is used for branch protection status checks.
   # See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
   # https://github.com/orgs/community/discussions/26822#discussioncomment-5122101
@@ -84,71 +91,9 @@ jobs:
     if: ${{ always() }} # need to use always() instead of !cancelled() because skipped jobs count as success
     needs:
       - dispatch-groups
+#       - verify-devcontainers
     steps:
       - name: Check status of all precursor jobs
         if: >-
           ${{contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')}}
         run: exit 1
-
-#   cccl-infra:
-#     name: CCCL Infrastructure
-#     permissions:
-#       id-token: write
-#       contents: read
-#     needs: compute-matrix
-#     if: ${{ !contains(github.event.head_commit.message, 'skip-tests') }}
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         include: ${{ fromJSON(needs.compute-matrix.outputs.CCCL_INFRA_MATRIX) }}
-#     uses: ./.github/workflows/run-as-coder.yml
-#     with:
-#       name: CCCL Examples CUDA${{matrix.cuda}} ${{matrix.compiler.name}}${{matrix.compiler.version}}
-#       runner: linux-${{matrix.cpu}}-gpu-v100-latest-1
-#       image: rapidsai/devcontainers:${{needs.compute-matrix.outputs.DEVCONTAINER_VERSION}}-cpp-${{matrix.compiler.name}}${{matrix.compiler.version}}-cuda${{matrix.cuda}}-${{matrix.os}}
-#       command: |
-#         cmake -S . --preset=cccl-infra -DCCCL_EXAMPLE_CPM_TAG=${GITHUB_SHA}
-#         ctest --preset=cccl-infra
-
-#   verify-devcontainers:
-#     name: Verify Dev Containers
-#     permissions:
-#       id-token: write
-#       contents: read
-#     uses: ./.github/workflows/verify-devcontainers.yml
-
-#   verify-codegen:
-#     name: Verify Codegen in libcudacxx
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout repo
-#         uses: actions/checkout@v3
-#       - name: Run libcudacxx codegen verification
-#         id: verify-codegen
-#         run: |
-#           sudo apt-get update
-#           sudo apt-get install ninja-build
-#           export CXX="g++"
-#           ./ci/verify_codegen.sh
-
-#   # This job is the final job that runs after all other jobs and is used for branch protection status checks.
-#   # See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
-#   # https://github.com/orgs/community/discussions/26822#discussioncomment-5122101
-#   ci:
-#     runs-on: ubuntu-latest
-#     name: CI
-#     if: ${{ always() }} # need to use always() instead of !cancelled() because skipped jobs count as success
-#     needs:
-#       - clang-cuda
-#       - cub
-#       - libcudacxx
-#       - nvrtc
-#       - thrust
-#       - cccl-infra
-#       - verify-devcontainers
-#       - verify-codegen
-#     steps:
-#       - name: Check status of all precursor jobs
-#         if: >-
-#           ${{contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')}}
-#        run: exit 1
diff --git a/ci/matrix.yaml b/ci/matrix.yaml
index e1232e7b2c2..5ec28b12e75 100644
--- a/ci/matrix.yaml
+++ b/ci/matrix.yaml
@@ -53,7 +53,8 @@ optional_tags: ['std', 'cmake_cuda_arch', 'cmake_options']
 explodable_tags: ['projects', 'std']
 
 # job_types that have an implied prerequisite 'build' job:
-build_required_job_types: ['test']
+build_required_job_types:
+  - 'test'
 
 # job_types that require a GPU
 gpu_required_job_types:
@@ -63,6 +64,7 @@ gpu_required_job_types:
 
 formatted_job_types: # Default: Capitalize first letter.
   'nvrtc': 'NVRTC'
+  'verify_codegen': 'VerifyCodegen'
 
 formatted_project_names:
   'libcudacxx': 'libcu++'
@@ -128,7 +130,6 @@ testing_pool_gpus:
   - 'rtx4090'
   - 'h100'
 
-
 #
 # Workflow matrices:
 #
@@ -171,6 +172,8 @@ pull_request:
   - {projects: ['cccl'], job_types: ['infra'], ctk: *ctk_prev_min, host_compiler: *llvm-oldest}
   - {projects: ['cccl'], job_types: ['infra'], ctk: *ctk_curr,     host_compiler: *gcc-newest}
   - {projects: ['cccl'], job_types: ['infra'], ctk: *ctk_curr,     host_compiler: *llvm-newest}
+  # verify-codegen:
+  - {projects: ['libcudacxx'], job_types: ['verify_codegen']}
 
 # Run each night:
 nightly:
diff --git a/ci/verify_codegen.sh b/ci/verify_codegen_libcudacxx.sh
similarity index 100%
rename from ci/verify_codegen.sh
rename to ci/verify_codegen_libcudacxx.sh