diff --git a/.bazelrc b/.bazelrc
index 9e4c0f91e..fc20f52e4 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -16,7 +16,6 @@ test --test_verbose_timeout_warnings
 
 build --incompatible_config_setting_private_default_visibility
 build --incompatible_disallow_empty_glob
-build --incompatible_enable_cc_toolchain_resolution
 build --incompatible_enforce_config_setting_visibility
 
 # Compiler configuration
diff --git a/.bazelversion b/.bazelversion
index 19b860c18..66ce77b7e 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.4.0
+7.0.0