diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index 32813ba..44e4b7a 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -3,17 +3,25 @@
   - "@boringssl//:ssl"
 
 matrix: &matrix
-  non_macos_platform:
+  linux_platforms:
     - debian11
     - ubuntu2204
-    - windows
   bazel: [7.x]
 tasks:
-  verify_targets:
-    name: Verify build targets
-    platform: ${{ non_macos_platform }}
+  verify_targets_on_linux:
+    name: Verify build targets on Linux
+    platform: ${{ linux_platforms }}
     bazel: ${{ bazel }}
     build_targets: *build_targets
+    build_flags:
+      - '--cxxopt=-std=c++17'
+  verify_targets_on_windows:
+    name: Verify build targets on Windows
+    platform: windows
+    bazel: ${{ bazel }}
+    build_targets: *build_targets
+    build_flags:
+      - '--cxxopt=/std:c++17'
   # Work around https://github.com/bazelbuild/bazel/issues/10472
   verify_targets_on_macos:
     name: Verify build targets on macOS
@@ -27,12 +35,22 @@
   module_path: util/bazel-example
   matrix: *matrix
   tasks:
-    run_test_module:
-      name: Run test module
-      platform: ${{ non_macos_platform }}
+    run_test_module_on_linux:
+      name: Run test module on Linux
+      platform: ${{ linux_platforms }}
       bazel: ${{ bazel }}
       build_targets:
         - //...
+      build_flags:
+        - '--cxxopt=-std=c++17'
+    run_test_module_on_windows:
+      name: Run test module on Windows
+      platform: windows
+      bazel: ${{ bazel }}
+      build_targets:
+        - //...
+      build_flags:
+        - '--cxxopt=/std:c++17'
     # Work around https://github.com/bazelbuild/bazel/issues/10472
     run_test_module_on_macos:
       name: Run test module on macOS