diff --git a/.github/workflows/therock-ci-linux.yml b/.github/workflows/therock-ci-linux.yml
index 7dec15726ae..611584f4dad 100644
--- a/.github/workflows/therock-ci-linux.yml
+++ b/.github/workflows/therock-ci-linux.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           repository: "ROCm/TheRock"
           path: "TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       - name: Install python deps
         run: |
diff --git a/.github/workflows/therock-ci-windows.yml b/.github/workflows/therock-ci-windows.yml
index 6a389d2a0de..510142584b8 100644
--- a/.github/workflows/therock-ci-windows.yml
+++ b/.github/workflows/therock-ci-windows.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           repository: "ROCm/TheRock"
           path: "TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       - name: Set up Python
         uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
diff --git a/.github/workflows/therock-rccl-ci-linux.yml b/.github/workflows/therock-rccl-ci-linux.yml
index 54b069f7ef8..777510db9d7 100644
--- a/.github/workflows/therock-rccl-ci-linux.yml
+++ b/.github/workflows/therock-rccl-ci-linux.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           repository: "ROCm/TheRock"
           path: "TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       - name: Install python deps
         run: |
diff --git a/.github/workflows/therock-rccl-test-packages-multi-node.yml b/.github/workflows/therock-rccl-test-packages-multi-node.yml
index 16e83825bf3..f056e02237e 100644
--- a/.github/workflows/therock-rccl-test-packages-multi-node.yml
+++ b/.github/workflows/therock-rccl-test-packages-multi-node.yml
@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: "ROCm/TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       - name: Run setup test environment workflow
         uses: './.github/actions/setup_test_environment'
diff --git a/.github/workflows/therock-test-component.yml b/.github/workflows/therock-test-component.yml
index 5a64188e8bc..a292cf829d5 100644
--- a/.github/workflows/therock-test-component.yml
+++ b/.github/workflows/therock-test-component.yml
@@ -25,13 +25,7 @@ jobs:
     runs-on: ${{ inputs.test_runs_on }}
     container:
       image: ${{ inputs.platform == 'linux' && 'ghcr.io/rocm/no_rocm_image_ubuntu24_04@sha256:4150afe4759d14822f0e3f8930e1124f26e11f68b5c7b91ec9a02b20b1ebbb98' || null }}
-      options: --ipc host
-        --group-add video
-        --device /dev/kfd
-        --device /dev/dri
-        --group-add 992
-        --group-add 110
-        --env-file /etc/podinfo/gha-gpu-isolation-settings
+      options: --ipc host --group-add video --device /dev/kfd --device /dev/dri --group-add 992 --group-add 110 --env-file /etc/podinfo/gha-gpu-isolation-settings
     strategy:
       fail-fast: false
       matrix:
@@ -65,7 +59,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: "ROCm/TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       - name: Run setup test environment workflow
         uses: './.github/actions/setup_test_environment'
diff --git a/.github/workflows/therock-test-packages.yml b/.github/workflows/therock-test-packages.yml
index 5c498fdb7cc..950ffdf97f3 100644
--- a/.github/workflows/therock-test-packages.yml
+++ b/.github/workflows/therock-test-packages.yml
@@ -29,7 +29,7 @@ jobs:
           sparse-checkout: build_tools
           path: "prejob"
           repository: "ROCm/TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       # Checkout failure is possible on Windows, as it's the first job on a GPU test runner.
       # Post-job cleanup isn't necessary since no executables are launched in this job.
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: "ROCm/TheRock"
-          ref: 37007c3e526156203fa8a4fab38b59415264d4b1 # 2026-03-06 commit
+          ref: a839ff11b737c64e9b3aa4907543e9ef2ca21a3a # 2026-03-06 commit
 
       - name: Setting up Python
         uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0