diff --git a/.bazelrc b/.bazelrc
index 2a4a4e2ad83f..2e0f49554a18 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,7 +1,7 @@
 build --define gotags=bazel,gss
 build --experimental_proto_descriptor_sets_include_source_info
 build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
-build --symlink_prefix=_bazel/ --experimental_no_product_name_out_symlink
+build --symlink_prefix=_bazel/
 test --config=test --experimental_ui_max_stdouterr_bytes=10485760
 build:with_ui --define cockroach_with_ui=y
 build:test --define crdb_test=y
diff --git a/.bazelversion b/.bazelversion
index 057c9e6004f7..7a22e8990c5f 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-cockroachdb/4.2.1
+cockroachdb/5.0.0