diff --git a/Dockerfile b/Dockerfile
index 57f4cb22..51e98731 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 FROM node:12-stretch-slim
 
 COPY . /opt/frontend/
-
+WORKDIR /opt/frontend/
 
 # Update apt packages
 RUN runDeps="openssl ca-certificates patch git" \
@@ -11,19 +11,17 @@ RUN runDeps="openssl ca-certificates patch git" \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* \
  && chown -R node /opt/frontend/ \
+ && cp jsconfig.json.tpl jsconfig.json \
+ && mkdir -p /opt/frontend/src/addons \
  && rm -rf /opt/frontend/src/addons/* \
- && cd /opt/frontend \
  && npm install -g mrs-developer
 
-WORKDIR /opt/frontend/
-
 USER node
 
 ARG MAX_OLD_SPACE_SIZE=8192
 ENV NODE_OPTIONS=--max_old_space_size=$MAX_OLD_SPACE_SIZE
 
 RUN cd /opt/frontend \
- && yarn develop \
  && RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn \
  && RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build \
  && rm -rf /home/node/.cache