diff --git a/Dockerfile b/Dockerfile
index 32e4a9c..9616536 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,10 +34,9 @@ RUN curl -fSL -o pyenv-installer ${PYENV_INSTALLER_URL}              &&\
     pip install -r /tmp/requirements.txt
 
 USER root
-WORKDIR /data/
 COPY src/frontend /data/
-RUN yarn install --frozen-lockfile
-RUN yarn build --no-progress
+RUN cd /data && yarn install --frozen-lockfile
+RUN cd /data && yarn build --no-progress
 
 ENV TFW_PUBLIC_PORT=8888          \
     TFW_WEB_PORT=4242             \
@@ -87,6 +86,7 @@ COPY supervisor/supervisord.conf ${TFW_SUPERVISORD_CONF}
 COPY supervisor/components/ ${TFW_SUPERVISORD_COMPONENTS}
 COPY lib ${TFW_LIB_DIR}
 COPY src/controller ${TFW_CONTROLLER_DIR}
+RUN mv /data/dist ${TFW_FRONTEND_DIR} && rm -rf /data
 
 ### TFW internals ^ ### DEMO v ###############################################################
 
@@ -95,8 +95,6 @@ ENV TFW_APP_DIR="/srv/app"                          \
     TFW_WEBIDE_WD="/home/${AVATAO_USER}/workdir"    \
     TFW_TERMINADO_WD="/home/${AVATAO_USER}/workdir"
 
-RUN mv /data/dist ${TFW_FRONTEND_DIR}
-
 COPY src/demo ${TFW_APP_DIR}/
 
 COPY src/demo/source_code_server/server.py ${TFW_LOGIN_APP_DIR}/