diff --git a/.github/workflows/build-interop-docker.yml b/.github/workflows/build-interop-docker.yml
index 138dc5936a0..e16663c7ea6 100644
--- a/.github/workflows/build-interop-docker.yml
+++ b/.github/workflows/build-interop-docker.yml
@@ -12,6 +12,8 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -20,5 +22,6 @@ jobs:
       - uses: docker/build-push-action@v4
         with:
           context: "{{defaultContext}}:interop"
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: martenseemann/quic-go-interop:latest
diff --git a/interop/Dockerfile b/interop/Dockerfile
index d83d5ce8673..48d4f0962f7 100644
--- a/interop/Dockerfile
+++ b/interop/Dockerfile
@@ -1,10 +1,17 @@
 FROM martenseemann/quic-network-simulator-endpoint:latest AS builder
 
+ARG TARGETPLATFORM
+RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}"
+
 RUN apt-get update && apt-get install -y wget tar git
 
-RUN wget https://dl.google.com/go/go1.20.linux-amd64.tar.gz && \
-  tar xfz go1.20.linux-amd64.tar.gz && \
-  rm go1.20.linux-amd64.tar.gz
+ENV GOVERSION=1.20.2
+
+RUN platform=$(echo ${TARGETPLATFORM} | tr '/' '-') && \
+  filename="go${GOVERSION}.${platform}.tar.gz" && \
+  wget https://dl.google.com/go/${filename} && \
+  tar xfz ${filename} && \
+  rm ${filename}
 
 ENV PATH="/go/bin:${PATH}"