diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 5ed87c3a7..8989df6c0 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -31,6 +31,14 @@ test_targets_bazel_6: &test_targets_bazel_6
   - "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
   - "-//tests/system_library:system_library_test" # Should be skipped on Windows and MacOS
 
+common_coverage_flags: &common_coverage_flags
+  # Starting in Bazel 9 coverage collection causes some tests to fail.
+  # https://github.com/bazelbuild/rules_cc/issues/613
+  - "--test_env=IGNORE_COVERAGE_COLLECTION_FAILURES=1"
+  # Test failures are not collected under `coverage` invocations.
+  # https://github.com/bazelbuild/continuous-integration/issues/1838
+  - "--test_output=errors"
+
 buildifier:
   version: latest
 
@@ -54,10 +62,16 @@ tasks:
       - "//examples/..."
       - "//tests/..."
       - "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
+  macos_intel_head:
+    name: MacOS Intel (Bazel HEAD)
+    bazel: last_green
+    platform: macos
+    build_targets: *build_targets
+    test_targets: *test_targets
   macos_head:
     name: MacOS (Bazel HEAD)
     bazel: last_green
-    platform: macos
+    platform: macos_arm64
     build_targets: *build_targets
     test_targets: *test_targets
   windows_head:
@@ -79,12 +93,22 @@ tasks:
     - "//examples/..."
     - "//tests/..."
     - "-//tests/rule_based_toolchain/tool_map:_duplicate_action_test_subject" # Intentionally broken rule.
+  macos_intel_rolling:
+    name: MacOS Intel (Bazel rolling)
+    bazel: rolling
+    platform: macos
+    build_targets: *build_targets
+    test_targets: *test_targets
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets
   macos_rolling:
     name: MacOS (Bazel rolling)
     bazel: rolling
-    platform: macos
+    platform: macos_arm64
     build_targets: *build_targets
     test_targets: *test_targets
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets
   windows_rolling:
     name: Windows (Bazel rolling)
     bazel: rolling
@@ -99,12 +123,24 @@ tasks:
     platform: ubuntu2004
     build_targets: *build_targets_bazel_6
     test_targets: *test_targets_bazel_6
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets_bazel_6
+  macos_intel_bazel_7:
+    name: MacOS Intel (Bazel 7)
+    bazel: 7.x
+    platform: macos
+    build_targets: *build_targets_bazel_6
+    test_targets: *test_targets_bazel_6
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets_bazel_6
   macos_bazel_7:
     name: MacOS (Bazel 7)
     bazel: 7.x
-    platform: macos
+    platform: macos_arm64
     build_targets: *build_targets_bazel_6
     test_targets: *test_targets_bazel_6
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets_bazel_6
   windows_bazel_7:
     name: Windows (Bazel 7)
     bazel: 7.x
@@ -119,12 +155,24 @@ tasks:
     platform: ubuntu2004
     build_targets: *build_targets_bazel_6
     test_targets: *test_targets_bazel_6
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets_bazel_6
+  macos_intel_bazel_8:
+    name: MacOS Intel (Bazel 8)
+    bazel: 8.x
+    platform: macos
+    build_targets: *build_targets_bazel_6
+    test_targets: *test_targets_bazel_6
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets_bazel_6
   macos_bazel_8:
     name: MacOS (Bazel 8)
     bazel: 8.x
-    platform: macos
+    platform: macos_arm64
     build_targets: *build_targets_bazel_6
     test_targets: *test_targets_bazel_6
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets_bazel_6
   windows_bazel_8:
     name: Windows (Bazel 8)
     bazel: 8.x
@@ -134,23 +182,36 @@ tasks:
 
 # Bazel 9
   ubuntu2004:
-    name: Ubuntu 20.04 (Bazel LTS)
-    bazel: last_rc # TODO: change to 9.x when released
+    name: Ubuntu 20.04 (Bazel 9)
+    bazel: 9.x
+    build_targets: *build_targets
+    test_targets: *test_targets
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets
+  macos_intel:
+    name: MacOS Intel (Bazel 9)
+    bazel: 9.x
+    platform: macos
     build_targets: *build_targets
     test_targets: *test_targets
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets
   macos:
-    name: MacOS (Bazel LTS)
-    bazel: last_rc # TODO: change to 9.x when released
+    name: MacOS (Bazel 9)
+    bazel: 9.x
+    platform: macos_arm64
     build_targets: *build_targets
     test_targets: *test_targets
+    coverage_flags: *common_coverage_flags
+    coverage_targets: *test_targets
   windows:
-    name: Windows (Bazel LTS)
-    bazel: last_rc # TODO: change to 9.x when released
+    name: Windows (Bazel 9)
+    bazel: 9.x
     build_targets: *build_targets
     test_targets: *test_targets
   ubuntu_bzlmod:
-    name: Ubuntu 20.04 (Bazel LTS, bzlmod)
-    bazel: last_rc # TODO: change to 9.x when released
+    name: Ubuntu 20.04 (Bazel 9, bzlmod)
+    bazel: 9.x
     platform: ubuntu2004
     build_flags:
       - "--enable_bzlmod"
@@ -167,7 +228,7 @@ tasks:
     test_targets:
       - "//..."
 
-  macos_rule_based_toolchains:
+  macos_intel_rule_based_toolchains:
     name: macOS rule-based toolchains
     platform: macos
     working_directory: examples/rule_based_toolchain
@@ -175,3 +236,11 @@ tasks:
       - "--enable_bzlmod"
     build_targets:
       - "//..."
+  macos_rule_based_toolchains:
+    name: macOS rule-based toolchains
+    platform: macos_arm64
+    working_directory: examples/rule_based_toolchain
+    build_flags:
+      - "--enable_bzlmod"
+    build_targets:
+      - "//..."
diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index b1335fb19..3a48e3bbb 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -3,6 +3,7 @@ matrix:
   bazel:
   - 7.x
   - 8.x
+  - 9.x
 tasks:
   verify_targets:
     name: "Verify build targets"