diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index d7bdcf828f..4bdd611d99 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -1,66 +1,20 @@
-matrix:
-  platform: ["debian10", "macos", "ubuntu2004"]
-  bazel: [7.x]
-
-tasks:
-  verify_targets:
-    name: "Verify build targets"
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_flags:
-    - '--host_cxxopt=-std=c++17'
-    - '--cxxopt=-std=c++17'
-    build_targets:
-    - '@protobuf//:protobuf'
-    - '@protobuf//:protobuf_lite'
-    - '@protobuf//:protobuf_python'
-    - '@protobuf//:protobuf_java'
-    - '@protobuf//:protoc'
-    - '@protobuf//:test_messages_proto2_cc_proto'
-    - '@protobuf//:test_messages_proto3_cc_proto'
-  # Separate windows for different c++ build flags.
-  verify_targets_windows:
-    name: "Verify windows build targets"
-    platform: windows
-    bazel: ${{ bazel }}
-    build_flags:
-    - '--cxxopt=/std:c++17'
-    - '--host_cxxopt=/std:c++17'
-    # Run using clang-cl
-    - '--extra_execution_platforms=@protobuf//build_defs:x64_windows-clang-cl'
-    - '--host_platform=@protobuf//build_defs:x64_windows-clang-cl'
-    - '--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl'
-    build_targets:
-    - '@protobuf//:protobuf'
-    - '@protobuf//:protobuf_lite'
-    - '@protobuf//:protobuf_python'
-    - '@protobuf//:protobuf_java'
-    - '@protobuf//:protoc'
-    - '@protobuf//:test_messages_proto2_cc_proto'
-    - '@protobuf//:test_messages_proto3_cc_proto'
-
 bcr_test_module:
-  module_path: "examples"
+  module_path: examples
   matrix:
-    platform: ["debian10", "macos", "ubuntu2004"]
+    platform: ["debian10", "macos", "ubuntu2004", "windows"]
     bazel: [7.x]
+
   tasks:
-    run_test_module:
-      name: "Run test module"
+    verify_targets:
+      name: "Verify build targets"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
-      build_flags:
-      - '--host_cxxopt=-std=c++17'
-      - '--cxxopt=-std=c++17'
-      build_targets:
-      - "//..."
-    # Separate windows for different c++ build flags.
-    run_test_module_windows:
-      name: "Run windows test module"
-      platform: windows
-      bazel: ${{ bazel }}
-      build_flags:
-      - '--cxxopt=/std:c++17'
-      - '--host_cxxopt=/std:c++17'
       build_targets:
-      - "//..."
+      - '//...'
+      - '@com_google_protobuf//:protobuf'
+      - '@com_google_protobuf//:protobuf_lite'
+      - '@com_google_protobuf//:protobuf_python'
+      - '@com_google_protobuf//:protobuf_java'
+      - '@com_google_protobuf//:protoc'
+      - '@com_google_protobuf//:test_messages_proto2_cc_proto'
+      - '@com_google_protobuf//:test_messages_proto3_cc_proto'
\ No newline at end of file