diff --git a/.dockerignore b/.dockerignore
index 2b5e51a618a9be6492db086de1ae4d57cc5ca41a..f8f914ddafd737fb61cd86032a2648f0b8788095 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,8 @@
-/node_modules
-/public
-/Dockerfile
-/.?*
+*
+.?*
+!assets/
+!bin/prezbuilder
+!gulpfile.esm.js/
+!lib/
+!package*.json
+!templates/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71fa2bb86d1ff35af4fbbbc7565673c4b23b8da0..b5ab44e14c41d2b4e99ebb2db21e5080fad036c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,7 @@ docker-image:
   script:
     - set -x
     - docker pull "${IMAGE}" || exit 0
-    - docker build --cache-from "node:buster-12,${IMAGE}" --tag "${IMAGE}" .
-    - docker run --rm "${IMAGE}" build
+    - docker build --cache-from "${IMAGE}" --tag "${IMAGE}" .
     - bash -x bin/prezbuilder-docker build src public
     - "[ -e public/index.html ]"
     - docker push "${IMAGE}"
diff --git a/Dockerfile b/Dockerfile
index 762a38e2b572a05edfda5dcd951936f54960e85c..85fa4f9ede91222f134ced996f073ecd6d45c03c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,21 +41,15 @@ RUN wget -nv -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/wkhtmltopdf/re
     && rm /tmp/wkhtmltox.deb \
     && wkhtmltopdf --version
 
-RUN mkdir -p /src /opt/prezbuilder
+RUN mkdir -p /workdir/src /workdir/public /opt/prezbuilder
 COPY --from=builder /opt/prezbuilder /opt/prezbuilder/
-COPY src/ /src/
 
 ENV SERVER_HOST=0.0.0.0 \
     SERVER_PORT=3000 \
-    SRC=/src \
-    OUTPUT=/public \
     WKHTMLTOPDF_BINARY=/usr/local/bin/wkhtmltopdf
 
-RUN mkdir -p -m 0777 $OUTPUT \
-    && ln -s /opt/prezbuilder/bin/prezbuilder /usr/local/bin/prezbuilder
-
-WORKDIR /src
+WORKDIR /workdir
 EXPOSE 3000/tcp 35729/tcp
 
-ENTRYPOINT ["/usr/local/bin/prezbuilder"]
+ENTRYPOINT ["/opt/prezbuilder/bin/prezbuilder"]
 CMD ["dev"]
diff --git a/bin/prezbuilder-docker b/bin/prezbuilder-docker
index d0937f81def86bb8f737393772223ba3d398cbf3..502a4937541fde5ba6aac5879e8aca0a01a67dec 100755
--- a/bin/prezbuilder-docker
+++ b/bin/prezbuilder-docker
@@ -3,9 +3,9 @@ exec docker run \
   --rm -t \
   --init \
   -u `id -u`:`id -g` \
-  -v `readlink -f ${2:-src}`:/src:ro \
-  -v `readlink -f ${3:-public}`:/public \
+  -v `readlink -f ${2:-src}`:/workdir/src:ro \
+  -v `readlink -f ${3:-public}`:/workdir/public \
   -p 3000:3000/tcp \
   -p 35729:35729/tcp \
   "${PREZBUILDER_IMAGE:-gitlab-registry.irstea.fr/pole-is/tools/prezbuilder}:${PREZBUILDER_TAG:-master}" \
-  "${1:-build}" /src /public
+  "${1:-build}" /workdir/src /workdir/public