diff --git a/Dockerfile b/Dockerfile
index 0b2bfaf..36e3525 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,11 +18,6 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - &&\
         libreadline-dev \
         libsqlite3-dev
 
-WORKDIR /data/
-COPY src/frontend /data/
-RUN yarn install --frozen-lockfile
-RUN yarn build --no-progress
-
 USER ${AVATAO_USER}
 WORKDIR /home/${AVATAO_USER}
 COPY .pyenvrc .
@@ -44,12 +39,17 @@ ENV TFW_WEB_PORT=4242
 ENV TFW_LOGIN_APP_PORT=6666
 ENV TFW_PUBLIC_PORT=8888
 ENV TFW_SUPERVISOR_HTTP_PORT=9001
+
+EXPOSE ${TFW_PUBLIC_PORT}
+
 ENV TFW_EVENT_HANDLERS_DIR="/opt/event_handlers"
 ENV TFW_APP_DIR="/srv/app"
 ENV TFW_FRONTEND_DIR="/srv/frontend"
 ENV TFW_LOGIN_APP_DIR="/tmp/source_code_server"
 ENV TFW_LIB_DIR="/usr/local/lib/"
+
 ENV TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf"
+
 ENV PYTHONPATH=${TFW_LIB_DIR}
 
 USER root
@@ -58,7 +58,12 @@ RUN chown -R ${AVATAO_USER}: /var/log/nginx /var/lib/nginx && \
     # nginx runs as a regular user, and can't write to /run
     sed -i 's#pid /run/nginx.pid;#pid /tmp/nginx.pid;#g' /etc/nginx/nginx.conf && \
     envsubst "$(printenv | cut -d= -f1 | grep TFW_ | sed -e 's/^/$/g')" \
-        < /etc/nginx/sites-available/default > /etc/nginx/sites-available/default && \
+        < /etc/nginx/sites-available/default > /etc/nginx/sites-available/default
+
+WORKDIR /data/
+COPY src/frontend /data/
+RUN yarn install --frozen-lockfile
+RUN yarn build --no-progress && \
     mv /data/dist ${TFW_FRONTEND_DIR}
 
 USER ${AVATAO_USER}
@@ -67,6 +72,5 @@ COPY lib ${TFW_LIB_DIR}
 COPY supervisord.conf ${TFW_SUPERVISORD_CONF}
 COPY src/app ${TFW_APP_DIR}
 COPY src/event_handlers ${TFW_EVENT_HANDLERS_DIR}
-EXPOSE ${TFW_PUBLIC_PORT}
 
 CMD . "$HOME/.pyenvrc" && exec supervisord --nodaemon