diff --git a/.bazelversion b/.bazelversion
index 91e4a9f..a3fcc71 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.3.2
+7.1.0
diff --git a/bazel/common.bazelrc b/bazel/common.bazelrc
index ebb4c3e..50ddd64 100644
--- a/bazel/common.bazelrc
+++ b/bazel/common.bazelrc
@@ -4,7 +4,6 @@ common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/ma
 common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
 common --registry=https://bcr.bazel.build
 build --enable_platform_specific_config
-build --incompatible_use_platforms_repo_for_constraints
 build --incompatible_enable_cc_toolchain_resolution
 build --incompatible_strict_action_env
 build --enable_runfiles
diff --git a/bazel/copts.bzl b/bazel/copts.bzl
index 51b6c1a..b8ebf62 100644
--- a/bazel/copts.bzl
+++ b/bazel/copts.bzl
@@ -6,7 +6,7 @@ copts = selects.with_or({
         "-std=c++20",
     ],
     ("@rules_cc//cc/compiler:clang"): [
-        "-std=c++2b",
+        "-std=c++20",
         "-fexperimental-library",
     ],
     ("@rules_cc//cc/compiler:msvc-cl", "@rules_cc//cc/compiler:clang-cl"): [