diff --git a/Dockerfile.dist b/Dockerfile.dist
index 99b8b21..df443e4 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -66,7 +66,8 @@ RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \
     apt-get update && \
     grep 'Depends:' "debian/control.in.${TARGETARCH}${TARGETVARIANT}" | cut -d' ' -f2- | sed -e 's/,/\n/g' | \
     xargs apt-get install --yes --no-install-recommends \
-        python3 python3-venv python3-pip
+        python3 python3-venv python3-pip \
+        build-essential python3-dev
 
 WORKDIR /test
 
@@ -77,6 +78,8 @@ COPY --from=build /build/mimic3/dist/*.tar.gz ./dist/
 # Install mimic3 using source distribution
 RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \
     python3 -m venv .venv && \
+    .venv/bin/pip3 install --upgrade pip \
+    .venv/bin/pip3 install --upgrade wheel setuptools \
     .venv/bin/pip3 install \
         -f wheels/ \
         -f https://synesthesiam.github.io/prebuilt-apps/ \