diff --git a/WORKSPACE b/WORKSPACE
index 482abc8de..d554e3271 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -83,7 +83,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 # Do not call go_rules_dependencies() until after all other go_repository
 # calls, or else the top-level definitions may be silently ignored.
 # https://github.com/bazelbuild/bazel/issues/3908
-go_register_toolchains(version = "1.19.2")
+go_register_toolchains(version = "1.21.1")
 
 http_archive(
     name = "com_github_kubernetes_sigs_application",
diff --git a/bazel/BUILD.sysroot b/bazel/BUILD.sysroot
index 8dfabd6c6..b4b88f48f 100644
--- a/bazel/BUILD.sysroot
+++ b/bazel/BUILD.sysroot
@@ -1,36 +1,38 @@
 filegroup(
     name = "all_files",
-    srcs = glob([
-        "lib/x86_64-linux-gnu/ld*",
-        "lib/x86_64-linux-gnu/libc*",
-        "lib/x86_64-linux-gnu/libdl*",
-        "lib/x86_64-linux-gnu/libgcc*",
-        "lib/x86_64-linux-gnu/libm*",
-        "lib/x86_64-linux-gnu/libpthread*",
-        "lib/x86_64-linux-gnu/librt*",
-        "lib/x86_64-linux-gnu/libutil*",
-        "lib64/**",
-        "usr/include/*.h",
-        "usr/include/arpa/**",
-        "usr/include/asm-generic/**",
-        "usr/include/c++/**",
-        "usr/include/linux/**",
-        "usr/include/net/**",
-        "usr/include/netinet/**",
-        "usr/include/rpc/**",
-        "usr/include/sys/**",
-        "usr/include/x86_64-linux-gnu/**",
-        "usr/lib/gcc/**",
-        "usr/lib/x86_64-linux-gnu/*crt*.o",
-        "usr/lib/x86_64-linux-gnu/libc_nonshared.a",
-        "usr/lib/x86_64-linux-gnu/libc.a",
-        "usr/lib/x86_64-linux-gnu/libc.so",
-        "usr/lib/x86_64-linux-gnu/libdl*",
-        "usr/lib/x86_64-linux-gnu/libm*",
-        "usr/lib/x86_64-linux-gnu/libpthread*",
-        "usr/lib/x86_64-linux-gnu/librt*",
-        "usr/lib/x86_64-linux-gnu/libutil*",
-      ],
+    srcs = glob(
+        [
+            "lib/x86_64-linux-gnu/ld*",
+            "lib/x86_64-linux-gnu/libc*",
+            "lib/x86_64-linux-gnu/libdl*",
+            "lib/x86_64-linux-gnu/libgcc*",
+            "lib/x86_64-linux-gnu/libm*",
+            "lib/x86_64-linux-gnu/libpthread*",
+            "lib/x86_64-linux-gnu/librt*",
+            "lib/x86_64-linux-gnu/libutil*",
+            "lib64/**",
+            "usr/include/*.h",
+            "usr/include/arpa/**",
+            "usr/include/asm-generic/**",
+            "usr/include/c++/**",
+            "usr/include/linux/**",
+            "usr/include/net/**",
+            "usr/include/netinet/**",
+            "usr/include/rpc/**",
+            "usr/include/sys/**",
+            "usr/include/x86_64-linux-gnu/**",
+            "usr/lib/gcc/**",
+            "usr/lib/x86_64-linux-gnu/*crt*.o",
+            "usr/lib/x86_64-linux-gnu/libc_nonshared.a",
+            "usr/lib/x86_64-linux-gnu/libc.a",
+            "usr/lib/x86_64-linux-gnu/libc.so",
+            "usr/lib/x86_64-linux-gnu/libdl*",
+            "usr/lib/x86_64-linux-gnu/libm*",
+            "usr/lib/x86_64-linux-gnu/libpthread*",
+            "usr/lib/x86_64-linux-gnu/libresolv.so",
+            "usr/lib/x86_64-linux-gnu/librt*",
+            "usr/lib/x86_64-linux-gnu/libutil*",
+        ],
     ),
     visibility = ["//visibility:public"],
 )
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 7d02a8373..5dfe708f2 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -49,19 +49,19 @@ def cloud_robotics_repositories():
     _maybe(
         http_archive,
         name = "io_bazel_rules_go",
-        sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
+        sha256 = "91585017debb61982f7054c9688857a2ad1fd823fc3f9cb05048b0025c47d023",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
+            "https://github.com/bazelbuild/rules_go/releases/download/v0.42.0/rules_go-v0.42.0.zip",
         ],
     )
     _maybe(
         http_archive,
         name = "bazel_gazelle",
-        sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
+        sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
         ],
     )
 
diff --git a/src/go/tests/relay/BUILD.bazel b/src/go/tests/relay/BUILD.bazel
index 3fed0f1c7..423f3391d 100644
--- a/src/go/tests/relay/BUILD.bazel
+++ b/src/go/tests/relay/BUILD.bazel
@@ -1,5 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
+# gazelle:go_test file
+
 go_test(
     name = "go_default_test",
     size = "large",