diff --git a/.bazelrc b/.bazelrc
index fbc00e3..1a8ecd1 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1 +1,4 @@
+# https://github.com/bazelbuild/rules_go/issues/3430
+build --experimental_output_directory_naming_scheme=diff_against_baseline
+
 test --test_env=GO_TEST_WRAP_TESTV=1
diff --git a/.bazelversion b/.bazelversion
index 84197c8..09b254e 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-5.3.2
+6.0.0