diff --git a/Dockerfile b/Dockerfile
index 8b9240eaf3d27d01bffe6aed10c09b8495aadae0..c62ef43c21cb93be198d3fcb40aff9830fbd4fb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,6 @@ ENV		BFANODEDIR=${BFANETWORKDIR}/node BFATOML=${BFANETWORKDIR}/config.toml
 RUN             mkdir ${BFANODEDIR} && ln -s ${BFANODEDIR} ${HOME}/.ethereum
 USER		${USERNAME}
 WORKDIR 	${BFAHOME}
-RUN		rm -f package-lock.json ; git checkout ${GITBRANCH} && git pull
+RUN		git checkout package-lock.json ; git checkout ${GITBRANCH} && git pull
 VOLUME          $BFANETWORKDIR/cache
 VOLUME          $BFANODEDIR
diff --git a/start.sh b/start.sh
index f3e98022b3b8432c25e643f94d50ee8a68327330..020831c32fd5dc90d40d0ec607c71e6840320774 100755
--- a/start.sh
+++ b/start.sh
@@ -25,11 +25,10 @@ else
     exit 1
 fi
 
-mounts="${name}_node:/home/bfa/bfa/${netdir}/node ${name}_cache:/home/bfa/bfa/${netdir}/cache"
+mounts="-v ${name}_node:/home/bfa/bfa/${netdir}/node -v ${name}_cache:/home/bfa/bfa/${netdir}/cache"
 ports="-p 8545:8545 -p 8546:8546 -p 30303:30303"
 
-docker run --rm $mounts -u root bfaar/nodo:${tag} chown -R 30303:30303 /home/bfa
-
+docker run $mounts --rm --user root bfaar/nodo:${tag} chown -R bfa:bfa /home/bfa/bfa/${netdir}/node /home/bfa/bfa/${netdir}/cache
 # Run this just a single time.
 # Docker itself makes sure it autostarts if it crashes or the server reboots.
 docker run                      \