diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
index 238840de9..6d213dc1d 100644
--- a/.github/workflows/push_docker_image.yml
+++ b/.github/workflows/push_docker_image.yml
@@ -43,11 +43,8 @@ jobs:
           docker login \
             --username '${{ secrets.DOCKER_USERNAME }}' \
             --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}'
-      - name: setup-qemu
-        run: |
-          docker run --rm --privileged multiarch/qemu-user-static \
-            --reset \
-            -p yes
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
@@ -60,6 +57,8 @@ jobs:
             tags: ${{ matrix.docker.repo }}:git-${{ github.sha }}
             file: ${{ matrix.docker.dockerfile }}
             build-args: COMMIT=git-${{ github.sha }}
+        env:
+            BUILDKIT_PROGRESS: 'plain'
 
   tag:
     name: tag (${{ matrix.docker.repo }})
diff --git a/Dockerfile b/Dockerfile
index e636ecdc3..0626f3b60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 ARG COMMIT
 ARG TARGETPLATFORM
@@ -31,7 +31,7 @@ fi
 EOF
 
 # Build runtime image
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim
 WORKDIR /app
 COPY --from=build-env /app/out .
 
diff --git a/Dockerfile.ACC b/Dockerfile.ACC
index 7098fa415..8e9f84ccf 100644
--- a/Dockerfile.ACC
+++ b/Dockerfile.ACC
@@ -1,5 +1,5 @@
 # Use the SDK image to build the app
-FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 ARG COMMIT
 ARG TARGETPLATFORM
@@ -32,7 +32,7 @@ fi
 EOF
 
 # Build runtime image
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .