diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63986de5f3ecac9a2e761f8e0b55f98ce5d3cf08..325c275b221353ffb7123191b1a84b9b19c0fc62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -224,7 +224,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 ec6e346f940758c846ea34f6218bee2b7d4c6d93..6ba15efb2a62f24a5928dddba15fd55815717531 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"