diff --git a/docker/psibase-contributor.Dockerfile b/docker/psibase-contributor.Dockerfile
index 9f21145..396a0b4 100644
--- a/docker/psibase-contributor.Dockerfile
+++ b/docker/psibase-contributor.Dockerfile
@@ -17,7 +17,7 @@ RUN export DEBIAN_FRONTEND=noninteractive   \
     && apt-get update                       \
     && apt-get install -yq                  \
         apt-transport-https                 \
-        clang-format-16                     \
+        clang-format-18                     \
         curl                                \
         gdb                                 \
         gnupg2                              \
diff --git a/docker/ubuntu-2004-builder.Dockerfile b/docker/ubuntu-2004-builder.Dockerfile
index 11bc698..cdd4789 100644
--- a/docker/ubuntu-2004-builder.Dockerfile
+++ b/docker/ubuntu-2004-builder.Dockerfile
@@ -26,13 +26,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         zstd                    \
 #   Clang / LLVM
     && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
-    && add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main" \
+    && add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main" \
     && apt-get update           \
     && apt-get install -yq      \
-        clang-16                \
-        libclang-16-dev         \
-        lld-16                  \
-        llvm-16                 \
+        clang-18                \
+        libclang-18-dev         \
+        lld-18                  \
+        llvm-18                 \
     && apt-get clean -yq        \
     && rm -rf /var/lib/apt/lists/*
 
@@ -63,17 +63,18 @@ RUN cd /root \
     && cd /root \
     && rm -rf boost*
 
-# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-20
-ENV WASI_SDK_PREFIX=/usr/lib/llvm-16
+# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-24
+ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
 ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
-RUN cd ${WASI_SDK_PREFIX}/lib/clang/16/                         \
-    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
-    && tar xf libclang_rt.builtins-wasm32-wasi-20.0.tar.gz      \
-    && rm libclang_rt.builtins-wasm32-wasi-20.0.tar.gz          \
+RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/                         \
+    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
+    && mkdir -p lib/wasi                                        \
+    && tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
+    && rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz          \
     && cd ${WASI_SDK_PREFIX}/share                              \
-    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz \
-    && tar xf wasi-sysroot-20.0.tar.gz                          \
-    && rm wasi-sysroot-20.0.tar.gz
+    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
+    && tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \
+    && rm wasi-sysroot-24.0.tar.gz
 
 # Node
 RUN <<EOT bash
diff --git a/docker/ubuntu-2204-builder.Dockerfile b/docker/ubuntu-2204-builder.Dockerfile
index 8b2851d..d34317d 100644
--- a/docker/ubuntu-2204-builder.Dockerfile
+++ b/docker/ubuntu-2204-builder.Dockerfile
@@ -23,13 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         zstd                    \
 #   Clang / LLVM
     && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
-    && add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" \
+    && add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" \
     && apt-get update           \
     && apt-get install -yq      \
-        clang-16                \
-        libclang-16-dev         \
-        lld-16                  \
-        llvm-16                 \
+        clang-18                \
+        libclang-18-dev         \
+        lld-18                  \
+        llvm-18                 \
     && apt-get clean -yq        \
     && rm -rf /var/lib/apt/lists/*
 
@@ -43,17 +43,18 @@ RUN cd /root \
     && cd /root \
     && rm -rf boost*
 
-# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-20
-ENV WASI_SDK_PREFIX=/usr/lib/llvm-16
+# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-24
+ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
 ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
-RUN cd ${WASI_SDK_PREFIX}/lib/clang/16/                         \
-    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
-    && tar xf libclang_rt.builtins-wasm32-wasi-20.0.tar.gz      \
-    && rm libclang_rt.builtins-wasm32-wasi-20.0.tar.gz          \
+RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/                         \
+    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
+    && mkdir -p lib/wasi                                        \
+    && tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
+    && rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz          \
     && cd ${WASI_SDK_PREFIX}/share                              \
-    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz \
-    && tar xf wasi-sysroot-20.0.tar.gz                          \
-    && rm wasi-sysroot-20.0.tar.gz
+    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
+    && tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \
+    && rm wasi-sysroot-24.0.tar.gz
 
 RUN <<EOT bash
     set -eux
diff --git a/docker/ubuntu-2404-builder.Dockerfile b/docker/ubuntu-2404-builder.Dockerfile
index bd378c1..798d8bc 100644
--- a/docker/ubuntu-2404-builder.Dockerfile
+++ b/docker/ubuntu-2404-builder.Dockerfile
@@ -21,10 +21,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         strace                  \
         wget                    \
         zstd                    \
-        clang-16                \
-        libclang-16-dev         \
-        lld-16                  \
-        llvm-16                 \
+        clang-18                \
+        libclang-18-dev         \
+        lld-18                  \
+        llvm-18                 \
         libboost1.83-dev        \
         libboost-chrono1.83-dev          \
         libboost-date-time1.83-dev       \
@@ -37,17 +37,18 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get clean -yq        \
     && rm -rf /var/lib/apt/lists/*
 
-# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-20
-ENV WASI_SDK_PREFIX=/usr/lib/llvm-16
+# https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-24
+ENV WASI_SDK_PREFIX=/usr/lib/llvm-18
 ENV PATH=${WASI_SDK_PREFIX}/bin:$PATH
-RUN cd ${WASI_SDK_PREFIX}/lib/clang/16/                         \
-    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/libclang_rt.builtins-wasm32-wasi-20.0.tar.gz \
-    && tar xf libclang_rt.builtins-wasm32-wasi-20.0.tar.gz      \
-    && rm libclang_rt.builtins-wasm32-wasi-20.0.tar.gz          \
+RUN cd ${WASI_SDK_PREFIX}/lib/clang/18/                         \
+    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/libclang_rt.builtins-wasm32-wasi-24.0.tar.gz \
+    && mkdir -p lib/wasi                                        \
+    && tar xf libclang_rt.builtins-wasm32-wasi-24.0.tar.gz -C lib/wasi --strip-components=1 \
+    && rm libclang_rt.builtins-wasm32-wasi-24.0.tar.gz          \
     && cd ${WASI_SDK_PREFIX}/share                              \
-    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sysroot-20.0.tar.gz \
-    && tar xf wasi-sysroot-20.0.tar.gz                          \
-    && rm wasi-sysroot-20.0.tar.gz
+    && curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-24/wasi-sysroot-24.0.tar.gz \
+    && tar xf wasi-sysroot-24.0.tar.gz --transform 's/^[^\/]*/wasi-sysroot/' \
+    && rm wasi-sysroot-24.0.tar.gz
 
 RUN <<EOT bash
     set -eux