diff --git a/common.dockcross b/common.dockcross
index efb0df9..cefea3c 100644
--- a/common.dockcross
+++ b/common.dockcross
@@ -19,9 +19,8 @@ RUN \
   /buildscripts/install-gosu-binary-wrapper.sh && \
   rm -rf /buildscripts
 
-RUN echo "root:root" | chpasswd
-WORKDIR /work
-ENTRYPOINT ["/dockcross/entrypoint.sh"]
-
 # Runtime scripts
 COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/
+
+WORKDIR /work
+ENTRYPOINT ["/dockcross/entrypoint.sh"]