diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 31136c253..0ca14da23 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -218,3 +218,7 @@ jobs:
         if: ${{ matrix.folder == '.' && matrix.os != 'windows-latest' }}
         # Find all shell scripts within e2e, echo the filename, execute, fail on error
         run: find e2e/*.sh -maxdepth 1 -type f -exec sh -c 'echo "\n\n------------------------------- $0 -------------------------------" && "$0" || kill $PPID' \{\} \;
+
+      - name: verify bcr patches
+        if: matrix.bzlmodEnabled
+        run: patch --dry-run -p1 < .bcr/patches/*.patch
diff --git a/lib/tests/run_binary_expansions/expansions_golden b/lib/tests/run_binary_expansions/expansions_golden
index 690910eda..beab6c73a 100644
--- a/lib/tests/run_binary_expansions/expansions_golden
+++ b/lib/tests/run_binary_expansions/expansions_golden
@@ -1,16 +1,16 @@
-bazel-out/PLATFORM-fastbuild/bin/lib/tests/run_binary_expansions/expansions_out
-bazel-out/PLATFORM-fastbuild/bin/lib/tests/run_binary_expansions
+bazel-out/PLATFORM-opt/bin/lib/tests/run_binary_expansions/expansions_out
+bazel-out/PLATFORM-opt/bin/lib/tests/run_binary_expansions
 lib/tests/run_binary_expansions/src_1
 lib/tests/run_binary_expansions/src_1
-bazel-out/PLATFORM-fastbuild/bin/lib/tests/run_binary_expansions/src_1
-bazel-out/PLATFORM-fastbuild/bin/lib/tests/run_binary_expansions/src_1
+bazel-out/PLATFORM-opt/bin/lib/tests/run_binary_expansions/src_1
+bazel-out/PLATFORM-opt/bin/lib/tests/run_binary_expansions/src_1
 aspect_bazel_lib/lib/tests/run_binary_expansions/src_1
 aspect_bazel_lib/lib/tests/run_binary_expansions/src_1
-bazel-out/PLATFORM-fastbuild/bin/lib/tests/run_binary_expansions/src_1
-bazel-out/PLATFORM-fastbuild/bin/lib/tests/run_binary_expansions/src_1
-fastbuild
-bazel-out/PLATFORM-fastbuild/bin
-bazel-out/PLATFORM-fastbuild/bin
+bazel-out/PLATFORM-opt/bin/lib/tests/run_binary_expansions/src_1
+bazel-out/PLATFORM-opt/bin/lib/tests/run_binary_expansions/src_1
+opt
+bazel-out/PLATFORM-opt/bin
+bazel-out/PLATFORM-opt/bin
 PLATFORM
 lib/tests/run_binary_expansions/BUILD.bazel
 bazel-out/volatile-status.txt