diff --git a/Dockerfile.dev b/Dockerfile.dev
index 5e547d8..8031b5c 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -5,40 +5,40 @@ ARG UID
 COPY scripts/my_init /usr/bin/my_init
 
 COPY scripts/docker-install-phase0.bash /tmp/
-RUN time /tmp/docker-install-phase0.bash
+RUN bash -c "time /tmp/docker-install-phase0.bash"
 
 COPY scripts/docker-install-phase1.bash /tmp/
-RUN time /tmp/docker-install-phase1.bash
+RUN bash -c "time /tmp/docker-install-phase1.bash"
 
 COPY scripts/docker-install-phase2.bash /tmp/
-RUN time /tmp/docker-install-phase2.bash
+RUN bash -c "time /tmp/docker-install-phase2.bash"
 
 COPY scripts/docker-install-phase3a.bash /tmp/
-RUN time /tmp/docker-install-phase3a.bash
+RUN bash -c "time /tmp/docker-install-phase3a.bash"
 
 COPY scripts/docker-install-phase3b.bash /tmp/
-RUN time /tmp/docker-install-phase3b.bash
+RUN bash -c "time /tmp/docker-install-phase3b.bash"
 
 COPY scripts/docker-install-phase3c.bash /tmp/
-RUN time /tmp/docker-install-phase3c.bash
+RUN bash -c "time /tmp/docker-install-phase3c.bash"
 
 COPY scripts/docker-install-phase3d.bash /tmp/
-RUN time /tmp/docker-install-phase3d.bash
+RUN bash -c "time /tmp/docker-install-phase3d.bash"
 
 COPY scripts/docker-install-phase4.bash /tmp/
-RUN time /tmp/docker-install-phase4.bash
+RUN bash -c "time /tmp/docker-install-phase4.bash"
 
 COPY scripts/docker-install-phase5.bash /tmp/
-RUN time /tmp/docker-install-phase5.bash
+RUN bash -c "time /tmp/docker-install-phase5.bash"
 
 COPY scripts/docker-install-phase6.bash /tmp/
-RUN time /tmp/docker-install-phase6.bash
+RUN bash -c "time /tmp/docker-install-phase6.bash"
 
 COPY scripts/docker-install-phase7.bash /tmp/
-RUN time /tmp/docker-install-phase7.bash
+RUN bash -c "time /tmp/docker-install-phase7.bash"
 
 COPY scripts/docker-install-phase8.bash /tmp/
-RUN time /tmp/docker-install-phase8.bash "$UID"
+RUN bash -c "time /tmp/docker-install-phase8.bash '$UID'"
 
 USER docker
 WORKDIR /home/docker
diff --git a/Dockerfile.prod b/Dockerfile.prod
index 8f411eb..9e364dd 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -7,40 +7,40 @@ ARG UID
 COPY scripts/my_init /usr/bin/my_init
 
 COPY scripts/docker-install-phase0.bash /tmp/
-RUN time /tmp/docker-install-phase0.bash
+RUN bash -c "time /tmp/docker-install-phase0.bash"
 
 COPY scripts/docker-install-phase1.bash /tmp/
-RUN time /tmp/docker-install-phase1.bash
+RUN bash -c "time /tmp/docker-install-phase1.bash"
 
 COPY scripts/docker-install-phase2.bash /tmp/
-RUN time /tmp/docker-install-phase2.bash
+RUN bash -c "time /tmp/docker-install-phase2.bash"
 
 COPY scripts/docker-install-phase3a.bash /tmp/
-RUN time /tmp/docker-install-phase3a.bash
+RUN bash -c "time /tmp/docker-install-phase3a.bash"
 
 COPY scripts/docker-install-phase3b.bash /tmp/
-RUN time /tmp/docker-install-phase3b.bash
+RUN bash -c "time /tmp/docker-install-phase3b.bash"
 
 COPY scripts/docker-install-phase3c.bash /tmp/
-RUN time /tmp/docker-install-phase3c.bash
+RUN bash -c "time /tmp/docker-install-phase3c.bash"
 
 COPY scripts/docker-install-phase3d.bash /tmp/
-RUN time /tmp/docker-install-phase3d.bash
+RUN bash -c "time /tmp/docker-install-phase3d.bash"
 
 COPY scripts/docker-install-phase4.bash /tmp/
-RUN time /tmp/docker-install-phase4.bash
+RUN bash -c "time /tmp/docker-install-phase4.bash"
 
 COPY scripts/docker-install-phase5.bash /tmp/
-RUN time /tmp/docker-install-phase5.bash
+RUN bash -c "time /tmp/docker-install-phase5.bash"
 
 COPY scripts/docker-install-phase6.bash /tmp/
-RUN time /tmp/docker-install-phase6.bash
+RUN bash -c "time /tmp/docker-install-phase6.bash"
 
 COPY scripts/docker-install-phase7.bash /tmp/
-RUN time /tmp/docker-install-phase7.bash
+RUN bash -c "time /tmp/docker-install-phase7.bash"
 
 COPY scripts/docker-install-phase8.bash /tmp/
-RUN time /tmp/docker-install-phase8.bash "$UID"
+RUN bash -c "time /tmp/docker-install-phase8.bash '$UID'"
 
 USER docker
 WORKDIR /home/docker
@@ -54,15 +54,15 @@ CMD ["yarn", "run", "server"]
 
 RUN mkdir /tmp/riju /tmp/riju/scripts
 COPY --chown=docker:docker package.json yarn.lock /tmp/riju/
-RUN time cd /tmp/riju && yarn install
+RUN bash -c "cd /tmp/riju && time yarn install"
 COPY --chown=docker:docker webpack.config.js tsconfig.json tsconfig-webpack.json /tmp/riju/
 COPY --chown=docker:docker frontend /tmp/riju/frontend
-RUN time cd /tmp/riju && yarn run frontend
+RUN bash -c "cd /tmp/riju && time yarn run frontend"
 COPY --chown=docker:docker backend /tmp/riju/backend
-RUN time cd /tmp/riju && yarn run backend
+RUN bash -c "cd /tmp/riju && time yarn run backend"
 COPY --chown=docker:docker scripts/compile-system.bash /tmp/riju/scripts
 COPY --chown=docker:docker system /tmp/riju/system
-RUN time cd /tmp/riju && RIJU_PRIVILEGED=1 yarn run system
+RUN bash -c "cd /tmp/riju && time RIJU_PRIVILEGED=1 yarn run system"
 COPY --chown=docker:docker . /home/docker/src
 RUN sudo cp -a /tmp/riju/* /home/docker/src/ && rm -rf /tmp/riju