diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index c2176c1..ac672b8 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -1,6 +1,6 @@
 matrix:
-  platform: ["macos", "ubuntu2004", "windows"]
-  bazel: ["6.x", "7.x", "rolling"]
+  platform: ["macos", "ubuntu2204", "windows"]
+  bazel: ["6.x", "7.x", "8.x", "9.x", "rolling"]
 
 tasks:
   verify_targets:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1cbb018..4673e57 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,6 +15,8 @@ jobs:
       - uses: actions/checkout@v4
       - run: USE_BAZEL_VERSION=6.x bazelisk test //tests/...
       - run: USE_BAZEL_VERSION=7.x bazelisk test //tests/... --enable_bzlmod=false
+      - run: USE_BAZEL_VERSION=8.x bazelisk test //tests/...
+      - run: USE_BAZEL_VERSION=9.x bazelisk test //tests/...
       - run: bazelisk test //...
       - run: USE_BAZEL_VERSION=rolling bazelisk test //...
       - run: USE_BAZEL_VERSION=last_green bazelisk test //...
@@ -25,6 +27,8 @@ jobs:
       - uses: actions/checkout@v4
       - run: USE_BAZEL_VERSION=6.x bazelisk test //tests/...
       - run: USE_BAZEL_VERSION=7.x bazelisk test //tests/... --enable_bzlmod=false
+      - run: USE_BAZEL_VERSION=8.x bazelisk test //tests/...
+      - run: USE_BAZEL_VERSION=9.x bazelisk test //tests/...
       - run: bazelisk test //...
       - run: USE_BAZEL_VERSION=rolling bazelisk test //...
       - run: USE_BAZEL_VERSION=last_green bazelisk test //...
@@ -34,7 +38,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: bazelisk test //tests/...
-      - run:  bazelisk test //tests/...
+      - run: bazelisk test //tests/...
         env:
           USE_BAZEL_VERSION: rolling
       - run: bazelisk test //tests/...