diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index aac4987d..4185b954 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -60,6 +60,9 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -68,6 +71,7 @@ jobs:
         with:
           context: .
           file:  ${{ matrix.dockerfile }}
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 030de5e0..5438dda9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 FROM debian:trixie-slim AS build
 
+ARG YAZ_VERSION=5.37.1
+ARG YAZPP_VERSION=1.9.1
+
 # Builds from the workspace root dir
 WORKDIR /app
 
@@ -12,10 +15,21 @@ RUN apt update && apt-get install -y \
   libboost-test-dev libboost-regex-dev \
   git
 
-RUN curl -s https://ftp.indexdata.com/debian/indexdata.gpg -o /usr/share/keyrings/indexdata.gpg
-RUN echo 'deb [signed-by=/usr/share/keyrings/indexdata.gpg] https://ftp.indexdata.com/debian trixie main' > /etc/apt/sources.list.d/indexdata.list
-RUN apt update
-RUN apt-get install -y libyazpp7-dev
+RUN curl https://ftp.indexdata.com/pub/yaz/yaz-${YAZ_VERSION}.tar.gz -o yaz-${YAZ_VERSION}.tar.gz
+RUN tar zxf yaz-${YAZ_VERSION}.tar.gz
+WORKDIR /app/yaz-${YAZ_VERSION}
+RUN ./configure --disable-shared --enable-static
+RUN make -j4
+
+WORKDIR /app
+
+RUN curl https://ftp.indexdata.com/pub/yazpp/yazpp-${YAZPP_VERSION}.tar.gz -o yazpp-${YAZPP_VERSION}.tar.gz
+RUN tar zxf yazpp-${YAZPP_VERSION}.tar.gz
+WORKDIR /app/yazpp-${YAZPP_VERSION}
+RUN ./configure --disable-shared --enable-static
+RUN make -j4
+
+WORKDIR /app
 
 COPY . metaproxy
 RUN cd metaproxy && ./buildconf.sh