diff --git a/WORKSPACE b/WORKSPACE
index 5670f7be..d4c7f7f6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -4,9 +4,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "bazel_toolchains",
-    sha256 = "882fecfc88d3dc528f5c5681d95d730e213e39099abff2e637688a91a9619395",
-    strip_prefix = "bazel-toolchains-3.4.0",
-    urls = ["https://github.com/bazelbuild/bazel-toolchains/releases/download/3.4.0/bazel-toolchains-3.4.0.tar.gz"],
+    sha256 = "09642745581d071c7cd670e57589ea1ba78c99e9d7edb8b7478bda2640773e90",
+    strip_prefix = "bazel-toolchains-022dcbb331a80548cefecc289f3741b98b882307",
+    urls = ["https://github.com/bazelbuild/bazel-toolchains/archive/022dcbb331a80548cefecc289f3741b98b882307.tar.gz"],
 )
 
 load(
diff --git a/toolchains/rbe_toolchains_config.bzl b/toolchains/rbe_toolchains_config.bzl
index aa60d314..212aa21b 100644
--- a/toolchains/rbe_toolchains_config.bzl
+++ b/toolchains/rbe_toolchains_config.bzl
@@ -44,7 +44,9 @@ _GCC_ENV = {
 
 _MSVC_CL_ENV = {}
 
-_CLANG_CL_ENV = {}
+_CLANG_CL_ENV = {
+    "USE_CLANG_CL": "1",
+}
 
 _TOOLCHAIN_CONFIG_SUITE_SPEC_LINUX = {
     "container_registry": _ENVOY_BUILD_IMAGE_REGISTRY,