diff --git a/packages/gifsicle/Dockerfile b/packages/gifsicle/Dockerfile
index e198915..3de0ce3 100644
--- a/packages/gifsicle/Dockerfile
+++ b/packages/gifsicle/Dockerfile
@@ -1,4 +1,5 @@
-FROM trzeci/emscripten:1.39.18-upstream
+ARG EMSCRIPTEN_VERSION=3.1.28
+FROM emscripten/emsdk:${EMSCRIPTEN_VERSION}
 
 RUN apt-get update && \
   apt-get install -y \
diff --git a/packages/mozjpeg/Dockerfile b/packages/mozjpeg/Dockerfile
index 1e9be2c..d5f0e48 100644
--- a/packages/mozjpeg/Dockerfile
+++ b/packages/mozjpeg/Dockerfile
@@ -1,4 +1,5 @@
-FROM trzeci/emscripten:1.39.18-upstream
+ARG EMSCRIPTEN_VERSION=3.1.28
+FROM emscripten/emsdk:${EMSCRIPTEN_VERSION}
 
 RUN apt-get update && \
   apt-get install -y \
diff --git a/packages/oxipng/Dockerfile b/packages/oxipng/Dockerfile
index db34167..c6db868 100644
--- a/packages/oxipng/Dockerfile
+++ b/packages/oxipng/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.45
+FROM rust:1.66
 
 RUN rustup target add wasm32-unknown-unknown
 RUN mkdir /opt/wabt && \