diff --git a/.bazelrc b/.bazelrc
index 6e4012195..e47533f8d 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,5 @@
+# Migration to Bzlmod is not ready yet, waiting for Protobuf to release 27.0
+common --noenable_bzlmod
+
 # Build in C++17 mode without a custom CROSSTOOL
 build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
-common --noenable_bzlmod
diff --git a/sandboxed_api/BUILD.bazel b/sandboxed_api/BUILD
similarity index 100%
rename from sandboxed_api/BUILD.bazel
rename to sandboxed_api/BUILD
diff --git a/sandboxed_api/examples/hello_sapi/.bazelrc b/sandboxed_api/examples/hello_sapi/.bazelrc
index a68e0702e..e47533f8d 100644
--- a/sandboxed_api/examples/hello_sapi/.bazelrc
+++ b/sandboxed_api/examples/hello_sapi/.bazelrc
@@ -1,2 +1,5 @@
+# Migration to Bzlmod is not ready yet, waiting for Protobuf to release 27.0
+common --noenable_bzlmod
+
 # Build in C++17 mode without a custom CROSSTOOL
-build --cxxopt=-std=c++17
+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
diff --git a/sandboxed_api/examples/hello_sapi/BUILD.bazel b/sandboxed_api/examples/hello_sapi/BUILD
similarity index 100%
rename from sandboxed_api/examples/hello_sapi/BUILD.bazel
rename to sandboxed_api/examples/hello_sapi/BUILD
diff --git a/sandboxed_api/examples/hello_sapi/WORKSPACE.bazel b/sandboxed_api/examples/hello_sapi/WORKSPACE
similarity index 100%
rename from sandboxed_api/examples/hello_sapi/WORKSPACE.bazel
rename to sandboxed_api/examples/hello_sapi/WORKSPACE
diff --git a/sandboxed_api/examples/stringop/BUILD.bazel b/sandboxed_api/examples/stringop/BUILD
similarity index 100%
rename from sandboxed_api/examples/stringop/BUILD.bazel
rename to sandboxed_api/examples/stringop/BUILD
diff --git a/sandboxed_api/examples/sum/BUILD.bazel b/sandboxed_api/examples/sum/BUILD
similarity index 100%
rename from sandboxed_api/examples/sum/BUILD.bazel
rename to sandboxed_api/examples/sum/BUILD
diff --git a/sandboxed_api/examples/zlib/BUILD.bazel b/sandboxed_api/examples/zlib/BUILD
similarity index 100%
rename from sandboxed_api/examples/zlib/BUILD.bazel
rename to sandboxed_api/examples/zlib/BUILD
diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/BUILD.bazel
rename to sandboxed_api/sandbox2/BUILD
diff --git a/sandboxed_api/sandbox2/examples/crc4/BUILD.bazel b/sandboxed_api/sandbox2/examples/crc4/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/crc4/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/crc4/BUILD
diff --git a/sandboxed_api/sandbox2/examples/custom_fork/BUILD.bazel b/sandboxed_api/sandbox2/examples/custom_fork/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/custom_fork/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/custom_fork/BUILD
diff --git a/sandboxed_api/sandbox2/examples/network/BUILD.bazel b/sandboxed_api/sandbox2/examples/network/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/network/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/network/BUILD
diff --git a/sandboxed_api/sandbox2/examples/network_proxy/BUILD.bazel b/sandboxed_api/sandbox2/examples/network_proxy/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/network_proxy/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/network_proxy/BUILD
diff --git a/sandboxed_api/sandbox2/examples/static/BUILD.bazel b/sandboxed_api/sandbox2/examples/static/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/static/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/static/BUILD
diff --git a/sandboxed_api/sandbox2/examples/tool/BUILD.bazel b/sandboxed_api/sandbox2/examples/tool/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/tool/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/tool/BUILD
diff --git a/sandboxed_api/sandbox2/examples/zlib/BUILD.bazel b/sandboxed_api/sandbox2/examples/zlib/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/examples/zlib/BUILD.bazel
rename to sandboxed_api/sandbox2/examples/zlib/BUILD
diff --git a/sandboxed_api/sandbox2/network_proxy/BUILD.bazel b/sandboxed_api/sandbox2/network_proxy/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/network_proxy/BUILD.bazel
rename to sandboxed_api/sandbox2/network_proxy/BUILD
diff --git a/sandboxed_api/sandbox2/testcases/BUILD.bazel b/sandboxed_api/sandbox2/testcases/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/testcases/BUILD.bazel
rename to sandboxed_api/sandbox2/testcases/BUILD
diff --git a/sandboxed_api/sandbox2/unwind/BUILD.bazel b/sandboxed_api/sandbox2/unwind/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/unwind/BUILD.bazel
rename to sandboxed_api/sandbox2/unwind/BUILD
diff --git a/sandboxed_api/sandbox2/util/BUILD.bazel b/sandboxed_api/sandbox2/util/BUILD
similarity index 100%
rename from sandboxed_api/sandbox2/util/BUILD.bazel
rename to sandboxed_api/sandbox2/util/BUILD
diff --git a/sandboxed_api/tools/clang_generator/BUILD.bazel b/sandboxed_api/tools/clang_generator/BUILD
similarity index 100%
rename from sandboxed_api/tools/clang_generator/BUILD.bazel
rename to sandboxed_api/tools/clang_generator/BUILD
diff --git a/sandboxed_api/tools/filewrapper/BUILD.bazel b/sandboxed_api/tools/filewrapper/BUILD
similarity index 100%
rename from sandboxed_api/tools/filewrapper/BUILD.bazel
rename to sandboxed_api/tools/filewrapper/BUILD
diff --git a/sandboxed_api/tools/python_generator/BUILD.bazel b/sandboxed_api/tools/python_generator/BUILD
similarity index 100%
rename from sandboxed_api/tools/python_generator/BUILD.bazel
rename to sandboxed_api/tools/python_generator/BUILD
diff --git a/sandboxed_api/util/BUILD.bazel b/sandboxed_api/util/BUILD
similarity index 100%
rename from sandboxed_api/util/BUILD.bazel
rename to sandboxed_api/util/BUILD