diff --git a/bazel/external/wee8.genrule_cmd b/bazel/external/wee8.genrule_cmd
index 505f33085a23d..ae858cc54487e 100644
--- a/bazel/external/wee8.genrule_cmd
+++ b/bazel/external/wee8.genrule_cmd
@@ -79,8 +79,9 @@ fi
 
 # Clang or not Clang, that is the question.
 WEE8_BUILD_ARGS+=" is_clang=$$IS_CLANG"
+WEE8_BUILD_ARGS+=" use_lld=$$IS_CLANG"
 # Hack to disable bleeding-edge compiler flags.
-WEE8_BUILD_ARGS+=" use_xcode_clang=true"
+WEE8_BUILD_ARGS+=" use_xcode_clang=$$IS_CLANG"
 # Use local toolchain.
 WEE8_BUILD_ARGS+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
 # Use local stdlibc++ / libc++.
diff --git a/bazel/external/wee8.patch b/bazel/external/wee8.patch
index c15f5d867a3b2..c7566fe53e2b2 100644
--- a/bazel/external/wee8.patch
+++ b/bazel/external/wee8.patch
@@ -1,5 +1,4 @@
 # 1. Fix linking with unbundled toolchain on macOS.
-# 2. Increase VSZ limit to 64 TiB (allows us to start up to 6,553 VMs).
 # 3. Fix linking with MSAN.
 # 4. Fix build with LLVM/Clang versions older than 13.0.0.
 --- build/toolchain/gcc_toolchain.gni
@@ -22,17 +21,6 @@
          # the "--start-group .. --end-group" feature isn't available on the aix ld.
          start_group_flag = "-Wl,--start-group"
          end_group_flag = "-Wl,--end-group "
---- src/objects/backing-store.cc
-+++ src/objects/backing-store.cc
-@@ -47,7 +47,7 @@ constexpr size_t kAddressSpaceLimit = 0x8000000000L;  // 512 GiB
- // RISC-V64 has a user space of 256GB on the Sv39 scheme.
- constexpr size_t kAddressSpaceLimit = 0x4000000000L;  // 256 GiB
- #elif V8_TARGET_ARCH_64_BIT
--constexpr size_t kAddressSpaceLimit = 0x10100000000L;  // 1 TiB + 4 GiB
-+constexpr size_t kAddressSpaceLimit = 0x400100000000L; // 64 TiB + 4 GiB
- #else
- constexpr size_t kAddressSpaceLimit = 0xC0000000;  // 3 GiB
- #endif
 --- build/config/sanitizers/sanitizers.gni
 +++ build/config/sanitizers/sanitizers.gni
 @@ -158,7 +158,7 @@ if (!is_a_target_toolchain) {
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index c5ac92c86cae6..1cc8735bb1e53 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -823,15 +823,15 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "V8",
         project_desc = "Google’s open source high-performance JavaScript and WebAssembly engine, written in C++",
         project_url = "https://v8.dev",
-        version = "9.5.172.21",
+        version = "9.6.180.12",
         # This archive was created using https://storage.googleapis.com/envoyproxy-wee8/wee8-archive.sh
         # and contains complete checkout of V8 with all dependencies necessary to build wee8.
-        sha256 = "cd19ab73840031b65f246ebf35a59b224fb043656d772b675b72d12215ec2fd0",
+        sha256 = "b6def6d8c859807e20b1c1c280dd9f30e153f6938b07e1fff38ab26648a7c4f6",
         urls = ["https://storage.googleapis.com/envoyproxy-wee8/wee8-{version}.tar.gz"],
         strip_prefix = "wee8",
         use_category = ["dataplane_ext"],
         extensions = ["envoy.wasm.runtime.v8"],
-        release_date = "2021-10-12",
+        release_date = "2021-11-09",
         cpe = "cpe:2.3:a:google:v8:*",
     ),
     com_github_google_quiche = dict(