diff --git a/docker/Dockerfile b/docker/Dockerfile
index c3299903e..aacecf028 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,14 +1,21 @@
-FROM python:3.10-slim
+# Build stage
+FROM python:3.10-slim AS builder
 COPY . /aider
 
-# Unfortunately to build the multi-arch docker image we need `build-essential` for amd64.
-# Apparently py-tree-sitter-languages doesn't have a pre-built binary wheel?
-
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y build-essential git libportaudio2 && \
+    apt-get install --no-install-recommends -y build-essential git && \
     rm -rf /var/lib/apt/lists/* && \
     pip install --no-cache-dir /aider && \
     rm -rf /aider
 
+# Final stage
+FROM python:3.10-slim
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y git libportaudio2 && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
+COPY --from=builder /usr/local/bin/aider /usr/local/bin/aider
+
 WORKDIR /app
 ENTRYPOINT ["aider"]