diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index a90b2ca..f890467 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -6,6 +6,8 @@ matrix:
   - macos_arm64
   bazel:
   - 7.x
+  - 8.x
+  - 9.*
 tasks:
   verify_targets:
     name: Verify build targets
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c07a346..e41c524 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,20 +14,20 @@ jobs:
     strategy:
       matrix:
         folder: [".", "examples/module", "examples/workspace"]
-        version: ["7.1.0", "8.0.0rc1"]
+        version: ["7.x", "8.x", "9.*"]
         os: ["ubuntu-latest", "windows-latest"]
+        exclude:
+          - folder: "examples/workspace"
+            version: "9.*"
     runs-on: ${{ matrix.os }}
+    env:
+      USE_BAZEL_VERSION: ${{ matrix.version }}
     steps:
       - uses: actions/checkout@v6
       - uses: bazel-contrib/setup-bazel@0.16.0
         with:
           repository-cache: true
           bazelrc: common --announce_rc --color=yes --enable_workspace
-      - name: Configure Bazel version
-        working-directory: ${{ matrix.folder }}
-        run: |
-          echo "${{ matrix.version }}" > .bazelversion
-          bazel version
       - name: Build
         working-directory: ${{ matrix.folder }}
         run: bazel build ...