diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 698ff0a6..f8961e37 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -20,6 +20,8 @@ jobs:
       matrix:
         postgres: ["14", "15", "16", "17"]
 
+    env:
+      BUILDKIT_PROGRESS: plain
     steps:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -38,14 +40,14 @@ jobs:
       - name: Set up Docker buildx
         uses: docker/setup-buildx-action@v3
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
       - name: docker bake
         uses: docker/bake-action@v5
         with:
           targets: pg_duckdb_${{ matrix.postgres }}
           push: true
           set: |
-            *.platform=linux/amd64,linux/arm64
+            *.platform=linux/amd64
             *.cache-to=type=gha,mode=max
             *.cache-from=type=gha
             postgres.tags=pgduckdb/pgduckdb:${{ matrix.postgres }}-${{ github.sha }}
diff --git a/Dockerfile b/Dockerfile
index ee85ea35..10ba07f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,9 @@ FROM postgres_base AS base
 FROM base AS builder
 ARG POSTGRES_VERSION
 
-RUN apt-get update -qq && \
+RUN apt-get update -qq && apt-get upgrade && \
+    apt-get install -y python3.11-minimal && \
+    apt-get install -y python3-yaml && \
     apt-get install -y \
     postgresql-server-dev-${POSTGRES_VERSION} \
     build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev \
@@ -38,7 +40,7 @@ COPY --chown=postgres:postgres test test
 RUN make clean-all
 
 # build
-RUN --mount=type=cache,target=/ccache/,uid=999,gid=999 echo "Available CPUs=$(nproc)" && make -j$(nproc)
+RUN --mount=type=cache,target=/ccache/,uid=999,gid=999 echo "Available CPUs=$(nproc)" && DUCKDB_GEN=make make -j1
 # install into location specified by pg_config for tests
 RUN make install
 # install into /out for packaging