diff --git a/.bazelrc b/.bazelrc
index f5ba7dbaa4..ffe8bfa226 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,9 +1,6 @@
 startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
 
 common --enable_platform_specific_config
-# TODO: Temporarily disable while rules_go migrates to Bzlmod for its dev build.
-# https://github.com/bazelbuild/bazel/issues/18958
-common --noexperimental_enable_bzlmod
 test --test_output=errors
 
 # Workaround for https://github.com/bazelbuild/continuous-integration/issues/2269.
diff --git a/.bazelversion b/.bazelversion
index 815da58b7a..2b0aa21219 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.4.1
+8.2.1
diff --git a/go/BUILD.bazel b/go/BUILD.bazel
index f582021b69..c4495b4166 100644
--- a/go/BUILD.bazel
+++ b/go/BUILD.bazel
@@ -60,6 +60,12 @@ bzl_library(
     ],
 )
 
+starlark_doc_extract(
+    name = "def.extract",
+    src = "def.bzl",
+    deps = ["def"],
+)
+
 bzl_library(
     name = "deps",
     srcs = ["deps.bzl"],