diff --git a/docker/linux/common_fun.sh b/docker/linux/common_fun.sh
index 58fedfc3..d4ed7592 100644
--- a/docker/linux/common_fun.sh
+++ b/docker/linux/common_fun.sh
@@ -43,7 +43,7 @@ install_libcxx () {
     cmake -GNinja \
           -B "${LIBCXX_PATH}" \
           -S "runtimes" \
-          -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx" \
+          -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx;libunwind" \
           -DLLVM_USE_LINKER=lld \
           -DLLVM_USE_SANITIZER="${LLVM_USE_SANITIZER}" \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
diff --git a/docker/linux/ubuntu/Dockerfile b/docker/linux/ubuntu/Dockerfile
index 3287c8b6..c4f35f24 100644
--- a/docker/linux/ubuntu/Dockerfile
+++ b/docker/linux/ubuntu/Dockerfile
@@ -8,7 +8,7 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-
     BAZELISK_SHA256SUM=ce52caa51ef9e509fb6b7e5ad892e5cf10feb0794b0aed4d2f36adb00a1a2779 \
     BAZELISK_SHA256SUM_ARM64=6070bf70915e92b3a5ce8eee6f4a8a0968bb350be2a98b80b0fd2fc13ce8a254 \
     BAZELISK_VERSION=1.18.0 \
-    CLANG_TOOLS_SHA256SUM=430fadf6b4b287686e7043792e4defc4b54a4911d02bda540aa5acf63a0de5fa \
+    CLANG_TOOLS_SHA256SUM=e58877fcd95ed106824bd1a31276dd17ed0c53adcd60ca75289eac0654f0a7f1 \
     DEBIAN_FRONTEND=noninteractive \
     LANG=en_US.utf8 \
     LCOV_VERSION=1.15 \
@@ -17,9 +17,9 @@ ARG ANDROID_CLI_TOOLS=https://dl.google.com/android/repository/commandlinetools-
     LLVM_DISTRO=x86_64-linux-gnu-ubuntu-18.04 \
     LLVM_DISTRO_ARM64=aarch64-linux-gnu \
     LLVM_DOWNLOAD_PREFIX=https://github.com/llvm/llvm-project/releases/download/llvmorg- \
-    LLVM_SHA256SUM=2b8a69798e8dddeb57a186ecac217a35ea45607cb2b3cf30014431cff4340ad1 \
-    LLVM_SHA256SUM_ARM64=b750ba3120e6153fc5b316092f19b52cf3eb64e19e5f44bd1b962cb54a20cf0a \
-    LLVM_VERSION=16.0.0 \
+    LLVM_SHA256SUM=54ec30358afcc9fb8aa74307db3046f5187f9fb89fb37064cdde906e062ebf36 \
+    LLVM_SHA256SUM_ARM64=dcaa1bebbfbb86953fdfbdc7f938800229f75ad26c5c9375ef242edad737d999 \
+    LLVM_VERSION=18.1.8 \
     ZULU_INSTALL_DEB=https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
 ENV LANG=$LANG
 SHELL ["/bin/bash", "-ec"]
diff --git a/docker/windows/docker_windows.ps1 b/docker/windows/docker_windows.ps1
index ab918111..edc931aa 100644
--- a/docker/windows/docker_windows.ps1
+++ b/docker/windows/docker_windows.ps1
@@ -131,8 +131,8 @@ AddToPath C:\tools\ninja
 
 # LLVM to ensure a 64-bit build of the tool (VS BuildTools ships a 32-bit build)
 DownloadAndCheck $env:TEMP\LLVM-win64.exe `
-                 https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/LLVM-16.0.0-win64.exe `
-                 e41295133d6d24cc8133702768ddb4e3bffd9f9b4a9b2faf9cd0a045cfc90abc
+                 https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/LLVM-18.1.8-win64.exe `
+                 94af030060d88cc17e9f00ef1663ebdc1126b35e16bebdfa1e807984b70abd8f
 RunAndCheckError $env:TEMP\LLVM-win64.exe @("/S") $true
 AddToPath $env:ProgramFiles\LLVM\bin