diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 12c6d40bb..8b47bf627 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -34,7 +34,9 @@ jobs:
           type=sha
 
     - name: "Setup Docker Buildx"
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
+      with:
+        platforms: linux/amd64
 
     - name: "Login to GitHub Container Registry"
       uses: docker/login-action@v2
@@ -44,10 +46,10 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: "Build and Publish Helper Image"
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v6
       with:
         context: .
-        file: ./docker/ci/helper.Dockerfile
+        file: ./docker/helper.Dockerfile
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/docker/ci/helper.Dockerfile b/docker/ci/helper.Dockerfile
deleted file mode 100644
index 7f7b4d376..000000000
--- a/docker/ci/helper.Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM rust:latest as builder
-
-COPY . /ipa/
-RUN cd /ipa && \
-  cargo build --bin helper --release --no-default-features \
-        --features "web-app real-world-infra compact-gate"
-
-# Copy them to the final image
-FROM debian:bullseye-slim
-
-COPY --from=builder /ipa/target/release/helper /bin/ipa-helper
-ENTRYPOINT ["/bin/ipa-helper"]
diff --git a/docker/helper.Dockerfile b/docker/helper.Dockerfile
index 52c0806ab..fc113222d 100644
--- a/docker/helper.Dockerfile
+++ b/docker/helper.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG SOURCES_DIR=/usr/src/ipa
-FROM rust:bullseye AS builder
+FROM rust:bookworm AS builder
 ARG SOURCES_DIR
 
 # Prepare helper binaries
@@ -10,7 +10,7 @@ RUN set -eux; \
     cargo build --bin helper --release --no-default-features --features "web-app real-world-infra compact-gate"
 
 # Copy them to the final image
-FROM debian:bullseye-slim
+FROM rust:slim-bookworm
 ENV HELPER_BIN_PATH=/usr/local/bin/ipa-helper
 ENV CONF_DIR=/etc/ipa
 ARG SOURCES_DIR