diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 331fbe4cfcd6209063c4faf9b766191e40aaa6a0..ae290157c96fb28211baf7336142035d81b44f04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -206,7 +206,7 @@ docker_deploy:
   script:
     - *define_network_branch_vars
     - podman manifest rm "$MANIFEST" 2>/dev/null || true
-    - podman build --layers --platform linux/amd64 --manifest "$MANIFEST" -f docker/Dockerfile --build-arg chain=$RUNTIME .
+    - podman build --layers --platform linux/amd64,linux/arm64 --manifest "$MANIFEST" -f docker/Dockerfile --build-arg chain=$RUNTIME .
     - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:$DOCKER_TAG"
     - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:latest"
   after_script:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 62f423629f7fe37f117f0921f5f119843f633237..4839f319f6e0a68aef600ff935c4d7a3496aebb7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,3 @@
-# Workaround for https://github.com/containers/buildah/issues/4742
-FROM debian:bullseye-slim as target
-
 # ------------------------------------------------------------------------------
 # Build Stage
 # ------------------------------------------------------------------------------
@@ -68,7 +65,7 @@ RUN if [ "$cucumber" != 0 ] && [ "$TARGETPLATFORM" = "$BUILDPLATFORM" ]; then \
 # Final Stage
 # ------------------------------------------------------------------------------
 
-FROM target
+FROM debian:bullseye-slim
 
 LABEL maintainer="Gilles Filippini <gilles.filippini@pini.fr>"
 LABEL version="0.0.0"