diff --git a/Dockerfile.geth b/Dockerfile.geth
index 9bf1fb72..51219d54 100644
--- a/Dockerfile.geth
+++ b/Dockerfile.geth
@@ -30,7 +30,7 @@ RUN git clone $REPO --branch $VERSION --single-branch . && \
 
 RUN go run build/ci.go install -static ./cmd/geth
 
-FROM golang:1.21
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install -y jq curl supervisor && \
diff --git a/Dockerfile.reth b/Dockerfile.reth
index f3090cea..daff33c0 100644
--- a/Dockerfile.reth
+++ b/Dockerfile.reth
@@ -14,7 +14,7 @@ RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
 RUN cd op-node && \
     make VERSION=$VERSION op-node
 
-FROM rust AS reth
+FROM rust:1.78 AS reth
 
 ARG FEATURES=jemalloc,asm-keccak,optimism
 
@@ -26,9 +26,9 @@ ENV REPO=https://github.com/paradigmxyz/reth.git
 ENV COMMIT=1c148e7f030f0b6b3610564e0142c799756666f4
 
 RUN git clone $REPO . && git checkout $COMMIT
-RUN cargo build --bin op-reth --locked --features jemalloc,optimism --profile maxperf
+RUN cargo build --bin op-reth --locked --features $FEATURES --profile maxperf
 
-FROM golang:1.21
+FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install -y jq curl supervisor && \