diff --git a/.bazelrc b/.bazelrc
index 924aad1e3..69a2d0c28 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -4,9 +4,11 @@ build --platforms @zig_sdk//libc_aware/platform:linux_amd64_gnu.2.34
 build --incompatible_use_toolchain_resolution_for_java_rules
 build --java_runtime_version=pinned_remotejdk_11
 build --tool_java_runtime_version=pinned_remotejdk_11
+build --experimental_output_directory_naming_scheme=diff_against_baseline
 test --java_runtime_version=pinned_remotejdk_11
 test --tool_java_runtime_version=pinned_remotejdk_11
 test --incompatible_use_toolchain_resolution_for_java_rules
+test --experimental_output_directory_naming_scheme=diff_against_baseline
 
 build:linux_amd64 --platforms @zig_sdk//libc_aware/platform:linux_amd64_gnu.2.34
 build:linux_arm64 --platforms @zig_sdk//libc_aware/platform:linux_arm64_gnu.2.34
diff --git a/toolchains/go_rules_deps.bzl b/toolchains/go_rules_deps.bzl
index 4046e8324..4f0e0f816 100644
--- a/toolchains/go_rules_deps.bzl
+++ b/toolchains/go_rules_deps.bzl
@@ -9,10 +9,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def go_deps():
     http_archive(
         name = "io_bazel_rules_go",
-        sha256 = "56d8c5a5c91e1af73eca71a6fab2ced959b67c86d12ba37feedb0a2dfea441a6",
+        sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
-            "https://github.com/bazelbuild/rules_go/releases/download/v0.37.0/rules_go-v0.37.0.zip",
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
+            "https://github.com/bazelbuild/rules_go/releases/download/v0.38.1/rules_go-v0.38.1.zip",
         ],
     )
     http_archive(