diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index fc189eff..ffccb67c 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       registry:
-        image: registry:2
+        image: docker.io/registry:2
         ports:
           - 5000:5000
     strategy:
@@ -53,6 +53,9 @@ jobs:
 
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+          platforms: linux/${{ matrix.arch }}
 
       - name: Get latest versions
         run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }}
diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index 8281e255..ba7641cf 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -47,6 +47,7 @@ RUN apt-get update \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
+    pkg-config \
     redis-tools \
     rlwrap \
     tk8.6-dev \
diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index a35b93fe..ff02845b 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -94,6 +94,7 @@ RUN apt-get update \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
+    pkg-config \
     redis-tools \
     rlwrap \
     tk8.6-dev \
diff --git a/images/production/Containerfile b/images/production/Containerfile
index 78c80f73..7f36e0ed 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -86,6 +86,7 @@ RUN apt-get update \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
+    pkg-config \
     redis-tools \
     rlwrap \
     tk8.6-dev \