diff --git a/docker/Dockerfile b/docker/Dockerfile
index 62f423629f7fe37f117f0921f5f119843f633237..76748dd7542e5d3fa383ed9afcb0aa4910c5120c 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
 # ------------------------------------------------------------------------------
@@ -69,11 +66,15 @@ RUN if [ "$cucumber" != 0 ] && [ "$TARGETPLATFORM" = "$BUILDPLATFORM" ]; then \
 # ------------------------------------------------------------------------------
 
 FROM target
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
 
 LABEL maintainer="Gilles Filippini <gilles.filippini@pini.fr>"
 LABEL version="0.0.0"
 LABEL description="Crypto-currency software (based on Substrate framework) to operate Äž1 libre currency"
 
+RUN echo "BUILDPLATFORM=$BUILDPLATFORM" >>/docker_debug
+RUN echo "TARGETPLATFORM=$TARGETPLATFORM" >>/docker_debug
 # Required certificates for RPC connections
 RUN apt-get update \
  && apt-get install -y --no-install-recommends ca-certificates