diff --git a/wasm-cc/bazel/deps.bzl b/wasm-cc/bazel/deps.bzl
index eb67f449..f0b091a4 100644
--- a/wasm-cc/bazel/deps.bzl
+++ b/wasm-cc/bazel/deps.bzl
@@ -8,12 +8,10 @@ load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
 load("@rules_perl//perl:deps.bzl", "perl_rules_dependencies")
 load("@rules_python//python:repositories.bzl", "py_repositories")
 load("@toolchains_llvm//toolchain:deps.bzl", "bazel_toolchain_dependencies")
-load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
 load("//bazel:versions.bzl", "VERSIONS")
 
 def resolve_envoy_example_wasmcc_dependencies(
         cmake_version=VERSIONS["cmake"],
-        llvm_version=VERSIONS["llvm"],
         ninja_version=VERSIONS["ninja"],
         setup_autotools_toolchain=True):
     compatibility_proxy_repo()
@@ -33,13 +31,4 @@ def resolve_envoy_example_wasmcc_dependencies(
         honggfuzz = False,
     )
     setup_sysroots()
-    if llvm_version != False:
-        llvm_toolchain(
-            name = "llvm_toolchain",
-            llvm_version = llvm_version,
-            sysroot = {
-                "linux-x86_64": "@sysroot_linux_amd64//:sysroot",
-                "linux-aarch64": "@sysroot_linux_arm64//:sysroot",
-            }
-        )
     go_rules_dependencies()
diff --git a/wasm-cc/bazel/toolchains.bzl b/wasm-cc/bazel/toolchains.bzl
index 388927e0..22d0138a 100644
--- a/wasm-cc/bazel/toolchains.bzl
+++ b/wasm-cc/bazel/toolchains.bzl
@@ -4,9 +4,10 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains")
 load("@rules_perl//perl:deps.bzl", "perl_register_toolchains")
 load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_toolchains")
 load("@rules_python//python:repositories.bzl", "python_register_toolchains")
+load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain")
 load("//bazel:versions.bzl", "VERSIONS")
 
-def load_envoy_example_wasmcc_toolchains(go=True):
+def load_envoy_example_wasmcc_toolchains(go=True, llvm_version=VERSIONS["llvm"]):
     envoy_api_dependencies()
     register_emscripten_toolchains()
     python_register_toolchains(
@@ -17,3 +18,12 @@ def load_envoy_example_wasmcc_toolchains(go=True):
         go_register_toolchains(VERSIONS["go"])
     rules_proto_grpc_toolchains()
     perl_register_toolchains()
+    if llvm_version != False:
+        llvm_toolchain(
+            name = "llvm_toolchain",
+            llvm_version = llvm_version,
+            sysroot = {
+                "linux-x86_64": "@sysroot_linux_amd64//:sysroot",
+                "linux-aarch64": "@sysroot_linux_arm64//:sysroot",
+            }
+        )
diff --git a/wasm-cc/bazel/versions.bzl b/wasm-cc/bazel/versions.bzl
index a1998c9f..501e612b 100644
--- a/wasm-cc/bazel/versions.bzl
+++ b/wasm-cc/bazel/versions.bzl
@@ -192,8 +192,8 @@ VERSIONS = {
     "toolchains_llvm": {
         "type": "github_archive",
         "repo": "bazel-contrib/toolchains_llvm",
-        "version": "1.4.0",
-        "sha256": "fded02569617d24551a0ad09c0750dc53a3097237157b828a245681f0ae739f8",
+        "version": "1.8.0",
+        "sha256": "3b05826f256040f91c24dcaad673eb1c91e4cc93f4043d0205f2512327640205",
         "url": "https://github.com/{repo}/releases/download/v{version}/{name}-v{version}.tar.gz",
         "strip_prefix": "{name}-v{version}",
     },