diff --git a/.github/actions/ci-env/action.yml b/.github/actions/ci-env/action.yml
index 7ad60c6aa5dd..15467522b408 100644
--- a/.github/actions/ci-env/action.yml
+++ b/.github/actions/ci-env/action.yml
@@ -13,7 +13,12 @@ outputs:
     value: "a022846cf553c2b135410a5168f97705f1b9c6ac" # 2026-08-22
   baseline-run-id:
     description: "TheRock workflow run ID for prebuilt stage artifacts"
-    value: "36226176568" # Updated by assistant-librarian[bot] on submodule bumps
+    # Temporary fix for stale HIP tests: this run matches therock-ref above and
+    # includes the test updates from ROCm/rocm-systems#12148 and #12250.
+    # Manually keeping these in sync is not sustainable; automate compatibility
+    # checks before reusing runtime-tests when either the ref or baseline changes.
+    # https://github.com/ROCm/TheRock/actions/runs/36388943167
+    value: "36388943167" # Updated by assistant-librarian[bot] on submodule bumps
   docker-image:
     description: "Docker container image for Linux builds"
     value: "ghcr.io/rocm/therock_build_manylinux_x86_64@sha256:cf4f6d9909056906e4a1c0bc4c245658a0af4c6a6174082a86adfa2d518b7aeb"