diff --git a/.github/actions/test-template/action.yml b/.github/actions/test-template/action.yml
index 788a8d9dff..14644ce176 100644
--- a/.github/actions/test-template/action.yml
+++ b/.github/actions/test-template/action.yml
@@ -58,6 +58,13 @@ inputs:
     description: "Whether this is a pull request from a fork"
     required: false
     default: "false"
+  registry:
+    description: "Registry to use for test"
+    required: false
+  test_data_path:
+    description: "Test data path"
+    required: false
+    default: "/mnt/datadrive/TestData"
   image-tag:
     description: "Override container image tag. If set, infers FAST=1 and prefetches venvs + regenerates fingerprint at startup."
     required: false
@@ -72,73 +79,12 @@ runs:
       run: |
         curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
 
-    - name: Azure Login
-      if: ${{ inputs.has-azure-credentials == 'true' }}
-      uses: azure/login@v2
-      with:
-        client-id: ${{ inputs.azure-client-id }}
-        tenant-id: ${{ inputs.azure-tenant-id }}
-        subscription-id: ${{ inputs.azure-subscription-id }}
-
-    - name: Azure ACR Login
-      if: ${{ inputs.has-azure-credentials == 'true' }}
-      shell: bash
-      run: |
-        az acr login --name nemoci
-
-    - name: Azure Fileshare
-      if: ${{ inputs.has-azure-credentials == 'true' && inputs.is_unit_test == 'false' && inputs.is_doc_test == 'false' }}
-      shell: bash
-      id: azure-fileshare
+    - name: Install uuidgen
+      shell: bash -x -e -u -o pipefail {0}
+      if: ${{ contains(inputs.runner, 'gcp') }}
       run: |
-        sudo apt update
-        sudo apt install -y cifs-utils
-
-        RESOURCE_GROUP_NAME="azure-gpu-vm-runner_group"
-        STORAGE_ACCOUNT_NAME="nemocistorageaccount2"
-        FILE_SHARE_NAME="fileshare"
-
-        MNT_ROOT="/media"
-        MNT_PATH="$MNT_ROOT/$STORAGE_ACCOUNT_NAME/$FILE_SHARE_NAME"
-
-        echo "MNT_PATH=$MNT_PATH" | tee -a "$GITHUB_OUTPUT"
-
-        sudo mkdir -p $MNT_PATH
-
-        # Create a folder to store the credentials for this storage account and
-        # any other that you might set up.
-        CREDENTIAL_ROOT="/etc/smbcredentials"
-        sudo mkdir -p "/etc/smbcredentials"
-
-        # Get the storage account key for the indicated storage account.
-        # You must be logged in with az login and your user identity must have
-        # permissions to list the storage account keys for this command to work.
-        STORAGE_ACCOUNT_KEY=$(az storage account keys list \
-            --resource-group $RESOURCE_GROUP_NAME \
-            --account-name $STORAGE_ACCOUNT_NAME \
-            --query "[0].value" --output tsv | tr -d '"')
-
-        # Create the credential file for this individual storage account
-        SMB_CREDENTIAL_FILE="$CREDENTIAL_ROOT/$STORAGE_ACCOUNT_NAME.cred"
-        if [ ! -f $SMB_CREDENTIAL_FILE ]; then
-            echo "username=$STORAGE_ACCOUNT_NAME" | sudo tee $SMB_CREDENTIAL_FILE > /dev/null
-            echo "password=$STORAGE_ACCOUNT_KEY" | sudo tee -a $SMB_CREDENTIAL_FILE > /dev/null
-        else
-            echo "The credential file $SMB_CREDENTIAL_FILE already exists, and was not modified."
-        fi
-
-        # Change permissions on the credential file so only root can read or modify the password file.
-        sudo chmod 600 $SMB_CREDENTIAL_FILE
-
-        # This command assumes you have logged in with az login
-        HTTP_ENDPOINT=$(az storage account show --resource-group $RESOURCE_GROUP_NAME --name $STORAGE_ACCOUNT_NAME --query "primaryEndpoints.file" --output tsv | tr -d '"')
-        SMB_PATH=$(echo $HTTP_ENDPOINT | cut -c7-${#HTTP_ENDPOINT})$FILE_SHARE_NAME
-
-        STORAGE_ACCOUNT_KEY=$(az storage account keys list --resource-group $RESOURCE_GROUP_NAME --account-name $STORAGE_ACCOUNT_NAME --query "[0].value" --output tsv | tr -d '"')
-
-        sudo mount -t cifs $SMB_PATH $MNT_PATH -o credentials=$SMB_CREDENTIAL_FILE,serverino,nosharesock,actimeo=30,mfsymlinks
-
-        ls -al $MNT_PATH/TestData
+        apt-get update
+        apt-get install -y uuid-runtime
 
     - name: Docker system cleanup
       shell: bash
@@ -148,7 +94,7 @@ runs:
     - name: Docker pull image
       shell: bash
       run: |
-        docker pull nemoci.azurecr.io/${{ inputs.image }}:${{ inputs.image-tag || github.run_id }}
+        docker pull ${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.image-tag || github.run_id }}
 
     - name: Create UUID
       id: uuid
@@ -183,11 +129,11 @@ runs:
           ${{ inputs.image-tag != '' && '--env FAST=1' || '' }} \
           --volume $(pwd)/${{ github.run_id }}/${{steps.uuid.outputs.id }}/nemo-rl:/opt/nemo-rl \
           --volume $GITHUB_ACTION_DIR:$GITHUB_ACTION_DIR \
-          --volume /mnt/datadrive/TestData/nemo-rl/datasets:/opt/nemo-rl/datasets:ro \
-          --volume /mnt/datadrive/TestData/nemo-rl/checkpoints:/home/TestData/nemo-rl/checkpoints:ro \
-          --volume /mnt/datadrive/TestData/nemo-rl/hf_home/hub:/home/TestData/nemo-rl/hf_home/hub \
-          --volume /mnt/datadrive/TestData/nemo-rl/hf_datasets_cache:/home/TestData/nemo-rl/hf_datasets_cache \
-          nemoci.azurecr.io/${{ inputs.image }}:${{ inputs.image-tag || github.run_id }} bash -eux -o pipefail -c '\
+          --volume ${{ inputs.test_data_path }}/nemo-rl/datasets:/opt/nemo-rl/datasets:ro \
+          --volume ${{ inputs.test_data_path }}/nemo-rl/checkpoints:/home/TestData/nemo-rl/checkpoints:ro \
+          --volume ${{ inputs.test_data_path }}/nemo-rl/hf_home/hub:/home/TestData/nemo-rl/hf_home/hub \
+          --volume ${{ inputs.test_data_path }}/nemo-rl/hf_datasets_cache:/home/TestData/nemo-rl/hf_datasets_cache \
+          ${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.image-tag || github.run_id }} bash -eux -o pipefail -c '\
             git config --global --add safe.directory /opt/nemo-rl
             # This is needed since we create virtualenvs in the workspace, so this allows it to be cleaned up if necessary
             umask 000
diff --git a/.github/workflows/cicd-main.yml b/.github/workflows/cicd-main.yml
index 1377ffa648..88a33daf2f 100644
--- a/.github/workflows/cicd-main.yml
+++ b/.github/workflows/cicd-main.yml
@@ -14,13 +14,10 @@
 name: "CICD NeMo RL"
 
 on:
-  pull_request:
+  push:
     branches:
-      - "main"
-      - "r**"
-    types: [labeled, opened, synchronize, reopened]
-  merge_group:
-    types: [checks_requested]
+      - main
+      - "pull-request/[0-9]+"
   schedule:
     - cron: "0 9 * * *"
   workflow_dispatch:
@@ -40,13 +37,9 @@ on:
         description: "Override container image tag (e.g. 'main'). Skips container build."
         required: false
         default: ""
-  # TODO: Due to limited compute, disabling pushes to main. This is okay to do since we force PRs to be up to date and the CI tests on pull/$PR_NUM/merge
-  #push:
-  #  branches:
-  #    - 'main'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -55,12 +48,61 @@ jobs:
     outputs:
       test_level: ${{ steps.evaluate.outputs.test_level }}
       image_tag: ${{ steps.evaluate.outputs.image_tag }}
+      base_ref: ${{ steps.base-head-ref.outputs.base_ref }}
+      base_sha: ${{ steps.base-head-ref.outputs.base_sha }}
+      head_ref: ${{ steps.base-head-ref.outputs.head_ref }}
+      head_sha: ${{ steps.base-head-ref.outputs.head_sha }}
+      head_label: ${{ steps.base-head-ref.outputs.head_label }}
+      has_skip_cicd: ${{ steps.base-head-ref.outputs.has_skip_cicd }}
     steps:
+      - name: Get PR info
+        id: get-pr-info
+        if: startsWith(github.ref, 'refs/heads/pull-request/')
+        uses: nv-gha-runners/get-pr-info@main
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Determine base and head references
+        id: base-head-ref
+        env:
+          IS_PULL_REQUEST_REF: ${{ startsWith(github.ref, 'refs/heads/pull-request/') }}
+          PR_INFO_JSON: ${{ steps.get-pr-info.outputs.pr-info }}
+        run: |
+          if [[ "$IS_PULL_REQUEST_REF" == "true" && -n "$PR_INFO_JSON" ]]; then
+            base_ref=$(echo "$PR_INFO_JSON" | jq -r '.base.ref')
+            base_sha=$(echo "$PR_INFO_JSON" | jq -r '.base.sha')
+            head_ref=$(echo "$PR_INFO_JSON" | jq -r '.head.ref')
+            head_sha=$(echo "$PR_INFO_JSON" | jq -r '.head.sha')
+            head_label=$(echo "$PR_INFO_JSON" | jq -r '.head.label // empty')
+            ci_label=$(echo "$PR_INFO_JSON" | jq -r '[.labels[]? | (if type == "string" then . else .name end) | select(startswith("CI:"))] | first // empty')
+            has_skip_cicd=$(echo "$PR_INFO_JSON" | jq -r '[.labels[]? | (if type == "string" then . else .name end) | select(. == "Skip CICD")] | length > 0')
+          else
+            base_ref="HEAD~1"
+            base_sha=$(git rev-parse HEAD~1)
+            head_ref="HEAD"
+            head_sha="${{ github.sha }}"
+            head_label="${{ github.ref_name }}"
+            ci_label=""
+            has_skip_cicd="false"
+          fi
+          [[ "$has_skip_cicd" != "true" ]] && has_skip_cicd="false"
+          echo "base_ref=$base_ref" >> "$GITHUB_OUTPUT"
+          echo "base_sha=$base_sha" >> "$GITHUB_OUTPUT"
+          echo "head_ref=$head_ref" >> "$GITHUB_OUTPUT"
+          echo "head_sha=$head_sha" >> "$GITHUB_OUTPUT"
+          echo "head_label=$head_label" >> "$GITHUB_OUTPUT"
+          echo "ci_label=$ci_label" >> "$GITHUB_OUTPUT"
+          echo "has_skip_cicd=$has_skip_cicd" >> "$GITHUB_OUTPUT"
+
       - name: Get changed files
         id: changed-files
-        if: github.event_name == 'pull_request'
+        if: startsWith(github.ref, 'refs/heads/pull-request/')
         uses: step-security/changed-files@v45.0.1
         with:
+          base_sha: ${{ steps.base-head-ref.outputs.base_sha }}
           files_yaml: |
             doc:
               - '**.md'
@@ -75,8 +117,8 @@ jobs:
           DOCS_ONLY: ${{ steps.changed-files.outputs.doc_any_changed == 'true' && steps.changed-files.outputs.src_any_changed == 'false' }}
           CHANGED_DOCS: ${{ steps.changed-files.outputs.doc_all_changed_files }}
           CHANGED_SRC: ${{ steps.changed-files.outputs.src_all_changed_files }}
-          IS_PULLREQUEST: ${{ github.event_name == 'pull_request' }}
-          LABEL: ${{ github.event.label.name }}
+          IS_PULLREQUEST: ${{ startsWith(github.ref, 'refs/heads/pull-request/') }}
+          LABEL: ${{ steps.base-head-ref.outputs.ci_label }}
           MERGE_GROUP: ${{ github.event_name == 'merge_group' }}
         run: |
           # Some output that's helpful for debugging
@@ -128,10 +170,22 @@ jobs:
           fi
           echo "image_tag=$IMAGE_TAG" | tee -a "$GITHUB_OUTPUT"
 
+  org-member-pre-flight:
+    uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/_cicd_preflight.yml@v0.78.0
+    with:
+      default_runner_prefix: ${{ vars.DEFAULT_RUNNER_PREFIX }}
+      non_nvidia_runner_prefix: ${{ vars.NON_NVIDIA_RUNNER_PREFIX }}
+      default_test_data_path: ${{ vars.DEFAULT_TEST_DATA_PATH }}
+      non_nvidia_test_data_path: ${{ vars.NON_NVIDIA_TEST_DATA_PATH }}
+      default_registry: ${{ vars.DEFAULT_CONTAINER_REGISTRY }}
+      non_nvidia_registry: ${{ vars.NON_NVIDIA_CONTAINER_REGISTRY }}
+    secrets:
+      NVIDIA_MANAGEMENT_ORG_PAT: ${{ secrets.NVIDIA_MANAGEMENT_ORG_PAT }}
+
   pr-branch-up-to-date-check:
     name: Check if PR branch is up to date
     needs: [pre-flight]
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ startsWith(github.ref, 'refs/heads/pull-request/') }}
     runs-on: ubuntu-latest
     env:
       MAX_COMMITS_BEHIND: 10
@@ -140,10 +194,10 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           REPO: ${{ github.repository }}
-          BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-          BASE_REF: ${{ github.base_ref }}
-          HEAD_LABEL: ${{ github.event.pull_request.head.label }}
+          BASE_SHA: ${{ needs.pre-flight.outputs.base_sha }}
+          HEAD_SHA: ${{ needs.pre-flight.outputs.head_sha }}
+          BASE_REF: ${{ needs.pre-flight.outputs.base_ref }}
+          HEAD_LABEL: ${{ needs.pre-flight.outputs.head_label }}
         run: |
           echo "Repository: $REPO"
           echo "Base branch: $BASE_REF (SHA: $BASE_SHA)"
@@ -227,14 +281,16 @@ jobs:
 
   build-container:
     if: ${{ needs.pre-flight.outputs.test_level != 'none' && needs.pre-flight.outputs.image_tag == '' }}
-    needs: [pre-flight]
-    uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/_build_container.yml@v0.52.0
+    needs: [pre-flight, org-member-pre-flight]
+    uses: NVIDIA-NeMo/FW-CI-templates/.github/workflows/_build_container.yml@v0.78.0
     with:
       build-ref: ${{ github.sha }}
-      image-name: nemo_rl_container
+      image-name: ${{ vars.CI_CONTAINER_NAME }}
       dockerfile: docker/Dockerfile
-      image-label: nemo-rl
+      runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
+      image-label: ${{ vars.CI_CONTAINER_NAME }}
       target: release
+      registry: ${{ needs.org-member-pre-flight.outputs.registry }}
       build-contexts: |
         nemo-rl=${{ github.run_id }}/
       build-args: |
@@ -247,8 +303,8 @@ jobs:
       matrix:
         include:
           - script: Docs_Tests
-            runner: self-hosted-azure
-    needs: [pre-flight, build-container]
+            runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
+    needs: [pre-flight, build-container, org-member-pre-flight]
     if: ${{ contains('docs L0 L1 L2', needs.pre-flight.outputs.test_level) }}
     runs-on: ${{ matrix.runner }}
     name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
@@ -260,9 +316,11 @@ jobs:
         uses: ./.github/actions/test-template
         with:
           runner: ${{ runner.name }}
+          registry: ${{ needs.org-member-pre-flight.outputs.registry }}
+          image: ${{ vars.CI_CONTAINER_NAME }}
+          test_data_path: ${{ needs.org-member-pre-flight.outputs.test_data_path }}
           script: ${{ matrix.script }}
           is_doc_test: "true"
-          is_fork_pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
 
   cicd-unit-tests:
     strategy:
@@ -270,12 +328,12 @@ jobs:
       matrix:
         include:
           - script: L0_Unit_Tests_Generation
-            runner: self-hosted-azure
+            runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
           - script: L0_Unit_Tests_Policy
-            runner: self-hosted-azure
+            runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
           - script: L0_Unit_Tests_Other
-            runner: self-hosted-azure
-    needs: [pre-flight, build-container, cicd-doc-tests]
+            runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
+    needs: [pre-flight, build-container, cicd-doc-tests, org-member-pre-flight]
     if: >-
       ${{
         (
@@ -298,10 +356,12 @@ jobs:
         with:
           runner: ${{ runner.name }}
           script: ${{ matrix.script }}
+          registry: ${{ needs.org-member-pre-flight.outputs.registry }}
+          test_data_path: ${{ needs.org-member-pre-flight.outputs.test_data_path }}
+          image: ${{ vars.CI_CONTAINER_NAME }}
           image-tag: ${{ needs.pre-flight.outputs.image_tag }}
           is_unit_test: "true"
           cpu-only: ${{ matrix.cpu-only || false }}
-          is_fork_pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
 
   cicd-functional-tests:
     strategy:
@@ -309,8 +369,8 @@ jobs:
       matrix:
         include:
           - script: L1_Functional_Tests_GPU
-            runner: self-hosted-azure
-    needs: [pre-flight, build-container, cicd-unit-tests]
+            runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
+    needs: [pre-flight, build-container, cicd-unit-tests, org-member-pre-flight]
     runs-on: ${{ matrix.runner }}
     if: ${{ contains('L1 L2', needs.pre-flight.outputs.test_level) }}
     name: ${{ matrix.is_optional && 'PLEASEFIXME_' || '' }}${{ matrix.script }}
@@ -324,8 +384,10 @@ jobs:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         with:
           runner: ${{ runner.name }}
+          registry: ${{ needs.org-member-pre-flight.outputs.registry }}
+          image: ${{ vars.CI_CONTAINER_NAME }}
+          test_data_path: ${{ needs.org-member-pre-flight.outputs.test_data_path }}
           script: ${{ matrix.script }}
-          is_fork_pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
 
   cicd-fast-functional-tests:
     strategy:
@@ -333,8 +395,8 @@ jobs:
       matrix:
         include:
           - script: L1_Functional_Tests_GPU
-            runner: self-hosted-azure
-    needs: [pre-flight]
+            runner: ${{ needs.org-member-pre-flight.outputs.runner_prefix }}-gpu-x2
+    needs: [pre-flight, build-container, org-member-pre-flight]
     if: ${{ needs.pre-flight.outputs.test_level == 'Lfast' }}
     runs-on: ${{ matrix.runner }}
     name: fast_${{ matrix.script }}
@@ -350,7 +412,9 @@ jobs:
           runner: ${{ runner.name }}
           script: ${{ matrix.script }}
           image-tag: ${{ needs.pre-flight.outputs.image_tag }}
-          is_fork_pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
+          registry: ${{ needs.org-member-pre-flight.outputs.registry }}
+          image: ${{ vars.CI_CONTAINER_NAME }}
+          test_data_path: ${{ needs.org-member-pre-flight.outputs.test_data_path }}
 
   CI_QA_Gate:
     name: "CI quality check${{ needs.pre-flight.outputs.test_level == 'none' && ' (No tests run: Label CI:L*)' || '' }}"
@@ -389,7 +453,7 @@ jobs:
                 )
               )
             }}
-          CI_SKIP: ${{ github.event.label.name == 'Skip CICD' }}
+          CI_SKIP: ${{ needs.pre-flight.outputs.has_cicd_skip_label }}
           TEST_LEVEL: ${{ needs.pre-flight.outputs.test_level }}
         run: |
           SUMMARY=$(echo $JOB_RESULTS | jq 'to_entries[] | .key + ": " + .value.result' | tr -d '"')
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a830e0a83f..33aec5a92a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -144,6 +144,16 @@ If you have write access to the repository (NVIDIA contributors):
 
 6. Create a pull request from your branch to the `main` branch.
 
+7. Run CI tests. CI tests do not run automatically when a pull request is opened.
+   - Apply a CI label based on the test suite to run.
+      - CI:docs - Runs doctests only
+      - CI:L0 - Runs doctests and unit tests
+      - CI:L1 - Runs doctests, unit tests, and functional tests
+      - CI:Lfast - Runs fast unit tests and functional tests only. Skips the container build.
+   - Comment `/ok to test commit-sha`. Replace `commit-sha` with the most recent commit to test such as `/ok to test 7166bce`.
+      - A bot will acknowledge the comment with a thumbs-up and begin the CI.
+      - It is possible to simplify the comment to `/ok to test` without the commit-sha. However, this is only allowed if all commits are from a trusted Nvidia developer and [cryptographically signed](https://docs.github.com/en/authentication/managing-commit-signature-verification).
+
 ### Design Documentation Requirement
 
 **Important**: All new key features (ex: enabling a new parallelization technique, enabling a new RL algorithm) must include documentation update (either a new doc or updating an existing one). This document update should:
diff --git a/tests/functional/eval.sh b/tests/functional/eval.sh
index 2a153ef153..9f3a8587d7 100644
--- a/tests/functional/eval.sh
+++ b/tests/functional/eval.sh
@@ -27,4 +27,5 @@ uv run coverage run -a --data-file=$PROJECT_ROOT/tests/.coverage --source=$PROJE
 cat $RUN_LOG | grep "score=" | sed 's/.*score=\([^ ]*\).*/{"score": \1}/' > $JSON_METRICS
 
 uv run tests/check_metrics.py $JSON_METRICS \
-  'data["score"] == 0.1'
+  'data["score"] >= 0.1' \
+  'data["score"] < 0.14'
diff --git a/tests/functional/eval_async.sh b/tests/functional/eval_async.sh
index c8c2a40433..9863a4225d 100644
--- a/tests/functional/eval_async.sh
+++ b/tests/functional/eval_async.sh
@@ -29,4 +29,5 @@ uv run coverage run -a --data-file=$PROJECT_ROOT/tests/.coverage --source=$PROJE
 cat $RUN_LOG | grep "score=" | sed 's/.*score=\([^ ]*\).*/{"score": \1}/' > $JSON_METRICS
 
 uv run tests/check_metrics.py $JSON_METRICS \
-  'data["score"] == 0.1'
+  'data["score"] >= 0.1' \
+  'data["score"] < 0.14'
diff --git a/tests/unit/models/generation/test_vllm_generation.py b/tests/unit/models/generation/test_vllm_generation.py
index 2d27abad27..5436159122 100644
--- a/tests/unit/models/generation/test_vllm_generation.py
+++ b/tests/unit/models/generation/test_vllm_generation.py
@@ -907,6 +907,11 @@ async def test_vllm_generation_with_hf_training_colocated(
     cluster, tokenizer, async_engine, cpu_offload, vllm_precision, enable_lora
 ):
     """This test validates that DTensor policy can work together with colocated vLLM policy."""
+    device_name = torch.cuda.get_device_name(0)
+    if vllm_precision == "fp8" and "GB200" in device_name:
+        pytest.skip(
+            "Skipping FP8 test on GB200 until fixed. See https://github.com/NVIDIA-NeMo/RL/issues/2081"
+        )
 
     # Skip the fp8 tests if the GPU is not H100 or newer (compute capability < 9.0)
     if vllm_precision == "fp8":
@@ -977,6 +982,12 @@ async def test_vllm_generation_with_hf_training_non_colocated(
     vllm_precision,
     enable_lora,
 ):
+    device_name = torch.cuda.get_device_name(0)
+    if vllm_precision == "fp8" and "GB200" in device_name:
+        pytest.skip(
+            "Skipping FP8 test on GB200 until fixed. See https://github.com/NVIDIA-NeMo/RL/issues/2081"
+        )
+
     # Skip the fp8 tests if the GPU is not H100 or newer (compute capability < 9.0)
     if vllm_precision == "fp8":
         major_capability, _ = torch.cuda.get_device_capability()
@@ -1616,6 +1627,11 @@ def test_vllm_weight_update_and_prefix_cache_reset(
     cluster, tokenizer, tensor_parallel_size, vllm_precision
 ):
     """Test that the vLLM prefix cache is correctly reset when weights change."""
+    device_name = torch.cuda.get_device_name(0)
+    if vllm_precision == "fp8" and "GB200" in device_name:
+        pytest.skip(
+            "Skipping FP8 test on GB200 until fixed. See https://github.com/NVIDIA-NeMo/RL/issues/2081"
+        )
 
     if vllm_precision == "fp8":
         major_capability, _ = torch.cuda.get_device_capability()
@@ -2025,6 +2041,11 @@ def test_vllm_generation_with_megatron_training(
 
     This test validates that vLLM and Megatron policies can work together.
     """
+    device_name = torch.cuda.get_device_name(0)
+    if vllm_precision == "fp8" and "GB200" in device_name:
+        pytest.skip(
+            "Skipping FP8 test on GB200 until fixed. See https://github.com/NVIDIA-NeMo/RL/issues/2081"
+        )
 
     # Skip invalid configurations: kv_cache_dtype=fp8 requires precision=fp8
     if kv_cache_dtype == "fp8" and vllm_precision != "fp8":
@@ -2199,6 +2220,11 @@ def test_vllm_generation_with_megatron_training_moe_model(
 
     This test validates that vLLM and Megatron policies can work together.
     """
+    device_name = torch.cuda.get_device_name(0)
+    if vllm_precision == "fp8" and "GB200" in device_name:
+        pytest.skip(
+            "Skipping FP8 test on GB200 until fixed. See https://github.com/NVIDIA-NeMo/RL/issues/2081"
+        )
 
     # Skip the fp8 tests if the GPU is not H100 or newer (compute capability < 9.0)
     if vllm_precision == "fp8":