diff --git a/.bazelrc b/.bazelrc
index c411a62..509861f 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -3,6 +3,8 @@ common --color=yes --curses=yes
 build --announce_rc
 build --incompatible_enable_cc_toolchain_resolution
 
+build --reuse_sandbox_directories
+
 build:hermetic-sandbox --experimental_use_hermetic_linux_sandbox
 build:hermetic-sandbox --sandbox_add_mount_pair=/bin
 build:hermetic-sandbox --sandbox_add_mount_pair=/usr
diff --git a/WORKSPACE b/WORKSPACE
index 91230ca..72add06 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -59,41 +59,22 @@ load("@llvm_toolchain_with_sysroot//:toolchains.bzl", "llvm_register_toolchains"
 
 ### ZIG
 
-#BAZEL_ZIG_CC_VERSION = "v1.0.1"
-BAZEL_ZIG_CC_VERSION = "60a9f12d67f5b6a5a79d1b45b07ded41cdbb96fe"
+HERMETIC_CC_TOOLCHAIN_VERSION = "v2.0.0-rc1"
 
 http_archive(
-    name = "bazel-zig-cc",
-    #sha256 = "e9f82bfb74b3df5ca0e67f4d4989e7f1f7ce3386c295fd7fda881ab91f83e509",
-    sha256 = "b005e86324022ffe040d47b0bf8216a527b403620cfb7b14c162224c6884afb8",
-    strip_prefix = "bazel-zig-cc-{}".format(BAZEL_ZIG_CC_VERSION),
+    name = "hermetic_cc_toolchain",
+    sha256 = "43a1b398f08109c4f03b9ba2b3914bd43d1fec0425f71b71f802bf3f78cee0c2",
     urls = [
-        "https://github.com/motiejus/bazel-zig-cc/archive/{}.tar.gz".format(BAZEL_ZIG_CC_VERSION),
-        #"https://mirror.bazel.build/github.com/uber/bazel-zig-cc/releases/download/{0}/{0}.tar.gz".format(BAZEL_ZIG_CC_VERSION),
-        #"https://github.com/uber/bazel-zig-cc/releases/download/{0}/{0}.tar.gz".format(BAZEL_ZIG_CC_VERSION),
+        "https://mirror.bazel.build/github.com/uber/bazel-zig-cc/releases/download/{0}/{0}.tar.gz".format(HERMETIC_CC_TOOLCHAIN_VERSION),
+        "https://github.com/uber/hermetic_cc_toolchain/releases/download/{0}/{0}.tar.gz".format(HERMETIC_CC_TOOLCHAIN_VERSION),
+        "https://dl.jakstys.lt/ntpad/hermetic_cc_toolchain-{}.tar.gz".format(HERMETIC_CC_TOOLCHAIN_VERSION),
+        "http://localhost:8000/hermetic_cc_toolchain-{}.tar.gz".format(HERMETIC_CC_TOOLCHAIN_VERSION),
     ],
 )
 
-load("@bazel-zig-cc//toolchain:defs.bzl", zig_toolchains = "toolchains")
+load("@hermetic_cc_toolchain//toolchain:defs.bzl", zig_toolchains = "toolchains")
 
-ZIG_VERSION = "0.11.0-dev.2441+eb19f73af-dbgsafe"
-ZIG_HASH = "fde61f641a557ec01784c99a62e5e7fde78d17c306280af851f469ff14c1e5a5"
-
-#ZIG_VERSION = "0.11.0-dev.2441+eb19f73af"
-#ZIG_HASH = "aa06f10bb1407d83eae790cba6be4721ec3e02e63aa209192a8919fc25db8544"
-
-zig_toolchains(
-    host_platform_sha256 = {
-        "linux-aarch64": "",
-        "linux-x86_64": ZIG_HASH,
-        "macos-aarch64": "",
-        "macos-x86_64": "",
-        "windows-x86_64": "",
-    },
-    url_formats = ["https://dl.jakstys.lt/ntpad/zig/zig-{host_platform}-{version}.{_ext}"],
-    version = ZIG_VERSION,
-    #version = "0.11.0-dev.811+8ff9284c4",
-)
+zig_toolchains()
 
 register_toolchains(
     # amd64 toolchains for libc-aware platforms: