diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 6afa44a5cb..5763e9d4f1 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -92,6 +92,9 @@ split_coverage_postprocessing_shell_commands: &split_coverage_postprocessing_she
   - echo "coverage --experimental_fetch_all_coverage_outputs" >> user.bazelrc
   - echo "coverage --experimental_split_coverage_postprocessing" >> user.bazelrc
   - echo "build --//rust/settings:experimental_use_coverage_metadata_files" >> user.bazelrc
+rbe_coverage_flags: &rbe_coverage_flags
+  # https://github.com/bazelbuild/bazel/issues/20578
+  - "--strategy=CoverageReport=local"
 tasks:
   ubuntu2204:
     build_targets: *default_linux_targets
@@ -106,6 +109,9 @@ tasks:
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
   macos:
     platform: macos_arm64
     build_targets: *default_macos_targets
@@ -133,6 +139,9 @@ tasks:
     shell_commands: *no_bzlmod_rbe_shell_commands
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
   macos_no_bzlmod:
     name: No Bzlmod
     platform: macos_arm64
@@ -213,6 +222,9 @@ tasks:
     build_flags: *aspects_flags
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
   rbe_ubuntu2204_rolling_with_aspects:
     name: RBE Rolling Bazel Version With Aspects
     platform: rbe_ubuntu2204
@@ -221,6 +233,9 @@ tasks:
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_targets: *default_rbe_targets
     test_targets: *default_rbe_targets
+    coverage_targets: *default_rbe_targets
+    coverage_flags: *rbe_coverage_flags
+    post_shell_commands: *coverage_validation_post_shell_commands
     build_flags: *aspects_flags
     soft_fail: yes
     bazel: "rolling"
diff --git a/.bazelrc b/.bazelrc
index 52fc278d16..3e6eb16300 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -18,6 +18,7 @@ coverage --combined_report=lcov
 # Avoid fully cached builds reporting no coverage and failing CI
 # https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
 coverage --experimental_fetch_all_coverage_outputs
+coverage --experimental_split_coverage_postprocessing
 
 # Required for some of the tests
 # https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library