diff --git a/substrate/.maintain/Dockerfile b/substrate/.maintain/Dockerfile
index 56bfc7a2cc48130b659ce7e0a5127d3119b59d12..2fc1532aa2837b3314eaf17a907ca765d33c85b5 100644
--- a/substrate/.maintain/Dockerfile
+++ b/substrate/.maintain/Dockerfile
@@ -20,7 +20,6 @@ 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 nightly && \
 	rustup default stable && \
 	cargo build "--$PROFILE"
 
@@ -34,9 +33,10 @@ ARG PROFILE=release
 RUN mv /usr/share/ca* /tmp && \
 	rm -rf /usr/share/*  && \
 	mv /tmp/ca-certificates /usr/share/ && \
-	mkdir -p /root/.local/share/Polkadot && \
-	ln -s /root/.local/share/Polkadot /data && \
-	useradd -m -u 1000 -U -s /bin/sh -d /substrate substrate
+	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
 
@@ -49,7 +49,7 @@ RUN rm -rf /usr/lib/python* && \
 	rm -rf /usr/bin /usr/sbin /usr/share/man
 
 USER substrate
-EXPOSE 30333 9933 9944
+EXPOSE 30333 9933 9944 9615
 VOLUME ["/data"]
 
 CMD ["/usr/local/bin/substrate"]