diff --git a/.github/actions/run-argument-comment-lint/action.yml b/.github/actions/run-argument-comment-lint/action.yml
index bcd54a9b94..16cdd54eb4 100644
--- a/.github/actions/run-argument-comment-lint/action.yml
+++ b/.github/actions/run-argument-comment-lint/action.yml
@@ -3,7 +3,7 @@ description: Run argument-comment-lint on codex-rs via Bazel.
 
 inputs:
   target:
-    description: Runner target passed to setup-bazel-ci.
+    description: Runner target passed to prepare-bazel-ci.
     required: true
   buildbuddy-api-key:
     description: BuildBuddy API key used by Bazel CI.
@@ -13,9 +13,10 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: ./.github/actions/setup-bazel-ci
+    - uses: ./.github/actions/prepare-bazel-ci
       with:
         target: ${{ inputs.target }}
+        cache-scope: bazel-argument-comment-lint
 
     - name: Install Linux sandbox build dependencies
       if: ${{ runner.os == 'Linux' }}
diff --git a/.github/scripts/v8_canary_changes.py b/.github/scripts/v8_canary_changes.py
index ee09b1bf39..08617e35fe 100644
--- a/.github/scripts/v8_canary_changes.py
+++ b/.github/scripts/v8_canary_changes.py
@@ -21,6 +21,7 @@ ROOT = Path(__file__).resolve().parents[2]
 CANARY_PATH_PATTERNS = {
     ".bazelrc",
     ".github/actions/setup-bazel-ci/**",
+    ".github/actions/prepare-bazel-ci/**",
     ".github/actions/setup-ci/**",
     ".github/scripts/run_bazel_with_buildbuddy.py",
     ".github/scripts/rusty_v8_bazel.py",
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index 1c4bd7126e..f90a7453b1 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -72,6 +72,8 @@ jobs:
 
       - name: Check MODULE.bazel.lock is up to date
         if: matrix.os == 'ubuntu-24.04' && matrix.target == 'x86_64-unknown-linux-gnu'
+        env:
+          BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
         shell: bash
         run: ./scripts/check-module-bazel-lock.sh
 
diff --git a/.github/workflows/rusty-v8-release.yml b/.github/workflows/rusty-v8-release.yml
index 02a421c052..e45ec5b58a 100644
--- a/.github/workflows/rusty-v8-release.yml
+++ b/.github/workflows/rusty-v8-release.yml
@@ -161,10 +161,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Bazel
-        uses: ./.github/actions/setup-bazel-ci
+      - name: Prepare Bazel CI
+        uses: ./.github/actions/prepare-bazel-ci
         with:
           target: ${{ matrix.target }}
+          cache-scope: bazel-v8
 
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
diff --git a/.github/workflows/v8-canary.yml b/.github/workflows/v8-canary.yml
index 9b8ddef557..b79bb8370c 100644
--- a/.github/workflows/v8-canary.yml
+++ b/.github/workflows/v8-canary.yml
@@ -174,10 +174,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Bazel
-        uses: ./.github/actions/setup-bazel-ci
+      - name: Prepare Bazel CI
+        uses: ./.github/actions/prepare-bazel-ci
         with:
           target: ${{ matrix.target }}
+          cache-scope: bazel-v8
 
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0