diff --git a/buildtools/re2/Dockerfile b/buildtools/re2/Dockerfile
index affa871..cf19eb8 100644
--- a/buildtools/re2/Dockerfile
+++ b/buildtools/re2/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright 2022 The OWASP Coraza contributors
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-20 AS base
+FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-22 AS base
 
 RUN apt-get update && apt-get install -y binaryen curl
 
@@ -28,7 +28,7 @@ RUN $CXX -c cre2.cpp -o cre2.o -I. -I/re2 $CXXFLAGS && \
 
 FROM base AS wazero
 
-ENV CFLAGS --target=wasm32-wasi-threads --sysroot=/wasi-sysroot -pthread -O3 -D__USE_ISOC11
+ENV CFLAGS --target=wasm32-wasi-threads --sysroot=/wasi-sysroot -pthread -O3 -D__USE_ISOC11 -msimd128
 ENV CXXFLAGS -fno-exceptions $CFLAGS
 ENV LDFLAGS $CFLAGS -mexec-model=reactor
 
@@ -77,10 +77,17 @@ RUN $CXX -o libcre2-noopt.so -Wl,--global-base=1024 $LDFLAGS \
 
 RUN wasm-opt -o libcre2.so --low-memory-unused --flatten --rereloop --converge -O3 libcre2-noopt.so
 
-FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-20
+FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-22
 
 COPY --from=tinygo /re2/obj/libre2.a libre2.a
 COPY --from=tinygo /cre2/libcre2.a libcre2.a
 COPY --from=wazero /cre2/libcre2.so libcre2.so
 
-CMD ["cp", "libre2.a", "libcre2.a", "libcre2.so", "/out/"]
+CMD ["cp", \
+     "libre2.a", \
+     "libcre2.a", \
+     "libcre2.so", \
+     "/wasi-sysroot/lib/wasm32-wasi/libc++.a", \
+     "/wasi-sysroot/lib/wasm32-wasi/libc++abi.a", \
+     "/usr/lib/llvm-17/lib/clang/17/lib/wasi/libclang_rt.builtins-wasm32.a", \
+     "/out/"]
diff --git a/internal/wasm/libc++.a b/internal/wasm/libc++.a
index 07f697e..5f64756 100644
Binary files a/internal/wasm/libc++.a and b/internal/wasm/libc++.a differ
diff --git a/internal/wasm/libc++abi.a b/internal/wasm/libc++abi.a
index 5fff4b7..fbe1ec1 100644
Binary files a/internal/wasm/libc++abi.a and b/internal/wasm/libc++abi.a differ
diff --git a/internal/wasm/libclang_rt.builtins-wasm32.a b/internal/wasm/libclang_rt.builtins-wasm32.a
index ddc075b..be09105 100644
Binary files a/internal/wasm/libclang_rt.builtins-wasm32.a and b/internal/wasm/libclang_rt.builtins-wasm32.a differ
diff --git a/internal/wasm/libcre2.a b/internal/wasm/libcre2.a
index 8cb47b6..c5f3de5 100644
Binary files a/internal/wasm/libcre2.a and b/internal/wasm/libcre2.a differ
diff --git a/internal/wasm/libcre2.so b/internal/wasm/libcre2.so
index a68e84b..188c95c 100755
Binary files a/internal/wasm/libcre2.so and b/internal/wasm/libcre2.so differ
diff --git a/internal/wasm/libre2.a b/internal/wasm/libre2.a
index ed5157a..9f95c13 100644
Binary files a/internal/wasm/libre2.a and b/internal/wasm/libre2.a differ