diff --git a/.dockerignore b/.dockerignore
index 39dbc05c97e16..c58599e3fb72b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,3 +4,4 @@ doc
 Dockerfile
 .dockerignore
 .local
+.env*
diff --git a/.maintain/Dockerfile b/.maintain/Dockerfile
deleted file mode 100644
index 21a41720f7d65..0000000000000
--- a/.maintain/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Note: We don't use Alpine and its packaged Rust/Cargo because they're too often out of date,
-# preventing them from being used to build Substrate/Polkadot.
-
-FROM phusion/baseimage:0.11 as builder
-LABEL maintainer="chevdor@gmail.com"
-LABEL description="This is the build stage for Substrate. Here we create the binary."
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-ARG PROFILE=release
-WORKDIR /substrate
-
-COPY . /substrate
-
-RUN apt-get update && \
-	apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
-	apt-get install -y cmake pkg-config libssl-dev git clang
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-	export PATH="$PATH:$HOME/.cargo/bin" && \
-	rustup toolchain install nightly && \
-	rustup target add wasm32-unknown-unknown --toolchain nightly && \
-	rustup default stable && \
-	cargo build "--$PROFILE"
-
-# ===== SECOND STAGE ======
-
-FROM phusion/baseimage:0.11
-LABEL maintainer="chevdor@gmail.com"
-LABEL description="This is the 2nd stage: a very small image where we copy the Substrate binary."
-ARG PROFILE=release
-
-RUN mv /usr/share/ca* /tmp && \
-	rm -rf /usr/share/*  && \
-	mv /tmp/ca-certificates /usr/share/ && \
-	useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate && \
-	mkdir -p /substrate/.local/share/substrate && \
-	chown -R substrate:substrate /substrate/.local && \
-	ln -s /substrate/.local/share/substrate /data
-
-COPY --from=builder /substrate/target/$PROFILE/substrate /usr/local/bin
-COPY --from=builder /substrate/target/$PROFILE/subkey /usr/local/bin
-COPY --from=builder /substrate/target/$PROFILE/node-rpc-client /usr/local/bin
-COPY --from=builder /substrate/target/$PROFILE/node-template /usr/local/bin
-COPY --from=builder /substrate/target/$PROFILE/chain-spec-builder /usr/local/bin
-
-# checks
-RUN ldd /usr/local/bin/substrate && \
-	/usr/local/bin/substrate --version
-
-# Shrinking
-RUN rm -rf /usr/lib/python* && \
-	rm -rf /usr/bin /usr/sbin /usr/share/man
-
-USER substrate
-EXPOSE 30333 9933 9944 9615
-VOLUME ["/data"]
-
-CMD ["/usr/local/bin/substrate"]
diff --git a/docker/polkadot_builder.Dockerfile b/docker/polkadot_builder.Dockerfile
new file mode 100644
index 0000000000000..f6bd7ef2b4ca9
--- /dev/null
+++ b/docker/polkadot_builder.Dockerfile
@@ -0,0 +1,39 @@
+# This is the build stage for Substrate. Here we create the binary.
+FROM docker.io/paritytech/ci-linux:production as builder
+
+WORKDIR /substrate
+COPY . /substrate
+RUN cargo build --locked --release
+
+# This is the 2nd stage: a very small image where we copy the Substrate binary."
+FROM docker.io/library/ubuntu:20.04
+LABEL description="Multistage Docker image for Substrate: a platform for web3" \
+    io.parity.image.type="builder" \
+    io.parity.image.authors="chevdor@gmail.com, devops-team@parity.io" \
+	io.parity.image.vendor="Parity Technologies" \
+	io.parity.image.description="Polkadot: a platform for web3" \
+	io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/docker/Dockerfile" \
+	io.parity.image.documentation="https://github.com/paritytech/polkadot/"
+
+RUN useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate && \
+	mkdir -p /data /substrate/.local/share/substrate && \
+	chown -R substrate:substrate /data && \
+	ln -s /data /substrate/.local/share/substrate
+
+COPY --from=builder /substrate/target/$PROFILE/substrate /usr/local/bin
+COPY --from=builder /substrate/target/$PROFILE/subkey /usr/local/bin
+COPY --from=builder /substrate/target/$PROFILE/node-rpc-client /usr/local/bin
+COPY --from=builder /substrate/target/$PROFILE/node-template /usr/local/bin
+COPY --from=builder /substrate/target/$PROFILE/chain-spec-builder /usr/local/bin
+
+# checks
+RUN ldd /usr/local/bin/substrate && \
+	/usr/local/bin/substrate --version
+
+# RUN	rm -rf /usr/bin /usr/sbin
+
+USER substrate
+EXPOSE 30333 9933 9944 9615
+VOLUME ["/data"]
+
+CMD ["/usr/local/bin/substrate"]