diff --git a/Dockerfile b/Dockerfile
index 1c6c79f..eead35b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,8 +83,8 @@ ONBUILD RUN chown -R ${AVATAO_USER} /var/log/nginx /var/lib/nginx
             done
 
 ONBUILD COPY ${BUILD_CONTEXT}/frontend /data/
-ONBUILD RUN if [ -z "${NOFRONTEND}" ]; then cd /data && yarn install --frozen-lockfile; fi
-ONBUILD RUN if [ -z "${NOFRONTEND}" ]; then cd /data && yarn build --no-progress; fi
-ONBUILD RUN if [ -z "${NOFRONTEND}" ]; then mv /data/dist ${TFW_FRONTEND_DIR} && rm -rf /data; fi
+ONBUILD RUN test -z "${NOFRONTEND}" && cd /data && yarn install --frozen-lockfile || :
+ONBUILD RUN test -z "${NOFRONTEND}" && cd /data && yarn build --no-progress || :
+ONBUILD RUN test -z "${NOFRONTEND}" && mv /data/dist ${TFW_FRONTEND_DIR} && rm -rf /data || :
 
 CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon