diff --git a/codecs/mozjpeg/Makefile b/codecs/mozjpeg/Makefile
index 59467252..65d23824 100644
--- a/codecs/mozjpeg/Makefile
+++ b/codecs/mozjpeg/Makefile
@@ -27,10 +27,12 @@ $(OUT_WASM): $(CODEC_OUT)
 		-I $(CODEC_DIR) \
 		${CXXFLAGS} \
 		${LDFLAGS} \
+		-mexec-model=reactor \
 		-o $@ \
 		enc/mozjpeg_enc.cpp \
 		$(CODEC_OUT)
-	$(BINARYEN_PREFIX)/bin/wasm-opt -O3 -o $(OUT_WASM) $(OUT_WASM)
+	$(BINARYEN_PREFIX)/bin/wasm-opt -O4 -o $(OUT_WASM) $(OUT_WASM)
+	$(WABT_PREFIX)/bin/wasm-strip $(OUT_WASM)
 
 # This one is a bit special: there is no rule for .libs/libjpeg.a
 #  so we use libjpeg.la which implicitly builds that one instead.
diff --git a/codecs/mozjpeg/enc/mozjpeg_enc.wasm b/codecs/mozjpeg/enc/mozjpeg_enc.wasm
index ceaf567f..6974d2e3 100755
Binary files a/codecs/mozjpeg/enc/mozjpeg_enc.wasm and b/codecs/mozjpeg/enc/mozjpeg_enc.wasm differ
diff --git a/codecs/wasi-sdk.Dockerfile b/codecs/wasi-sdk.Dockerfile
index c947d449..8e1f1445 100644
--- a/codecs/wasi-sdk.Dockerfile
+++ b/codecs/wasi-sdk.Dockerfile
@@ -7,5 +7,8 @@ RUN mkdir -p ${WASI_SDK_PREFIX} && \
 ENV BINARYEN_PREFIX "/opt/binaryen"
 RUN mkdir -p ${BINARYEN_PREFIX} && \
   curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz --strip 1 -C ${BINARYEN_PREFIX}
+ENV WABT_PREFIX "/opt/wabt"
+RUN mkdir -p ${WABT_PREFIX} && \
+  curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.23/wabt-1.0.23-ubuntu.tar.gz | tar -xz --strip 1 -C ${WABT_PREFIX}
 WORKDIR /src
 CMD ["sh", "-c", "make -j`nproc`"]