diff --git a/.bazelrc b/.bazelrc
index eb28164ad..924aad1e3 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,6 +1,6 @@
 build --incompatible_enable_cc_toolchain_resolution
+build --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 build --platforms @zig_sdk//libc_aware/platform:linux_amd64_gnu.2.34
-build --extra_toolchains @zig_sdk//libc_aware/toolchain: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
@@ -9,10 +9,6 @@ test --tool_java_runtime_version=pinned_remotejdk_11
 test --incompatible_use_toolchain_resolution_for_java_rules
 
 build:linux_amd64 --platforms @zig_sdk//libc_aware/platform:linux_amd64_gnu.2.34
-build:linux_amd64 --extra_toolchains @zig_sdk//libc_aware/toolchain:linux_amd64_gnu.2.34
 build:linux_arm64 --platforms @zig_sdk//libc_aware/platform:linux_arm64_gnu.2.34
-build:linux_arm64 --extra_toolchains @zig_sdk//libc_aware/toolchain:linux_arm64_gnu.2.34
-build:linux_amd64_static --platforms @zig_sdk//platform:linux_amd64
-build:linux_amd64_static --extra_toolchains @zig_sdk//toolchain:linux_amd64_musl
-build:linux_arm64_static --platforms @zig_sdk//platform:linux_arm64
-build:linux_arm64_static --extra_toolchains @zig_sdk//toolchain:linux_arm64_musl
+build:linux_amd64_static --platforms @zig_sdk//libc_aware/platform:linux_amd64_musl
+build:linux_arm64_static --platforms @zig_sdk//libc_aware/platform:linux_arm64_musl
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 5f9694227..b3f02a0be 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -64,8 +64,13 @@ zig_toolchains()
 
 register_toolchains(
     "@zig_sdk//libc_aware/toolchain:linux_amd64_gnu.2.34",
+    "@zig_sdk//libc_aware/toolchain:linux_arm64_gnu.2.34",
     "@zig_sdk//libc_aware/toolchain:linux_amd64_musl",
     "@zig_sdk//libc_aware/toolchain:linux_arm64_musl",
+    "@zig_sdk//toolchain:linux_amd64_gnu.2.34",
+    "@zig_sdk//toolchain:linux_arm64_gnu.2.34",
+    "@zig_sdk//toolchain:linux_amd64_musl",
+    "@zig_sdk//toolchain:linux_arm64_musl",
     "@zig_sdk//toolchain:darwin_amd64",
     "@zig_sdk//toolchain:darwin_arm64",
     "@zig_sdk//toolchain:windows_amd64",