diff --git a/buildtools/bdwgc/Dockerfile b/buildtools/bdwgc/Dockerfile
index a137e0e..1c5a996 100644
--- a/buildtools/bdwgc/Dockerfile
+++ b/buildtools/bdwgc/Dockerfile
@@ -1,9 +1,9 @@
-# Copyright The OWASP Coraza contributors
-# SPDX-License-Identifier: Apache-2.0
+# Copyright wasilibs authors
+# SPDX-License-Identifier: MIT
 
-FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
+FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-20
 
-RUN apt-get install -y autogen autoconf automake libtool
+RUN apt-get -y update && apt-get -y install curl
 
 RUN mkdir -p /bdwgc && curl -L https://github.com/ivmai/bdwgc/archive/0a1667bee7f2c004abda6ecd173cd80bfef8412c.tar.gz | tar -xz --strip-components 1 -C /bdwgc
 WORKDIR /bdwgc
@@ -11,10 +11,10 @@ RUN ./autogen.sh
 
 # While signals aren't actually used the header file is included unconditionally. We can enable the header file
 # without linking the actual signals library because the functions aren't called.
-ENV CFLAGS -D_WASI_EMULATED_SIGNAL ${CFLAGS}
+ENV CFLAGS -O3 -D_WASI_EMULATED_SIGNAL ${CFLAGS}
 
 # host is required by configure but not used so set it arbitrarily
 RUN ./configure --disable-threads --disable-shared --disable-gcj-support --disable-java-finalization --disable-atomic-uncollectible --host=i686-pc-linux-gnu
 RUN make
 
-CMD ["sh", "-c", "cp /bdwgc/.libs/libgc.a /usr/lib/llvm-15/lib/clang/15.*/lib/wasi/libclang_rt.builtins-wasm32.a /out/"]
+CMD ["sh", "-c", "cp /bdwgc/.libs/libgc.a /usr/lib/llvm-${LLVM_VERSION}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a /out/"]
diff --git a/buildtools/mimalloc/Dockerfile b/buildtools/mimalloc/Dockerfile
index df05cc4..d65d56a 100644
--- a/buildtools/mimalloc/Dockerfile
+++ b/buildtools/mimalloc/Dockerfile
@@ -1,13 +1,13 @@
-# Copyright The OWASP Coraza contributors
-# SPDX-License-Identifier: Apache-2.0
+# Copyright wasilibs authors
+# SPDX-License-Identifier: MIT
 
-FROM ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-wasi-sdk:main
+FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-20
 
-RUN apt-get install -y cmake
+RUN apt-get -y update && apt-get -y install curl
 
 # Enables export of aligned_alloc
 # TODO(anuraaga): It seems like this should be set automatically, consider debugging further.
-ENV CFLAGS -D__USE_ISOC11 ${CFLAGS}
+ENV CFLAGS -O3 -D__USE_ISOC11 ${CFLAGS}
 
 RUN mkdir -p /mimalloc && curl -L https://github.com/microsoft/mimalloc/archive/d1fff1119a52e15c1c3807efe1077024c39fe70e.tar.gz | tar -xz --strip-components 1 -C /mimalloc
 WORKDIR /mimalloc
diff --git a/wasm/libclang_rt.builtins-wasm32.a b/wasm/libclang_rt.builtins-wasm32.a
index ab8d67b..8a04c61 100644
Binary files a/wasm/libclang_rt.builtins-wasm32.a and b/wasm/libclang_rt.builtins-wasm32.a differ
diff --git a/wasm/libgc.a b/wasm/libgc.a
index b6b04b6..455022b 100644
Binary files a/wasm/libgc.a and b/wasm/libgc.a differ
diff --git a/wasm/libmimalloc.a b/wasm/libmimalloc.a
index a011635..cd2638c 100644
Binary files a/wasm/libmimalloc.a and b/wasm/libmimalloc.a differ