diff --git a/docs.Dockerfile b/docs.Dockerfile
index dd05873..9bb0a51 100644
--- a/docs.Dockerfile
+++ b/docs.Dockerfile
@@ -1,13 +1,14 @@
 # Generate the HTML output.
 FROM ghcr.io/cakephp/docs-builder as builder
 
-COPY docs /data/docs
-
 ENV LANGS="en es fr ja"
 
+WORKDIR /data/docs-builder
+
+COPY docs /data/docs
+
 # Build docs with sphinx
-RUN cd /data/docs-builder && \
-  make website LANGS="$LANGS" SOURCE=/data/docs DEST=/data/website
+RUN make website LANGS="$LANGS" SOURCE=/data/docs DEST=/data/website
 
 # Build a small nginx container with just the static site in it.
 FROM ghcr.io/cakephp/docs-builder:runtime as runtime
@@ -18,11 +19,7 @@ ENV SEARCH_SOURCE="/usr/share/nginx/html"
 ENV SEARCH_URL_PREFIX="/authorization/3"
 
 COPY --from=builder /data/docs /data/docs
-COPY --from=builder /data/website /data/website
+COPY --from=builder /data/website/html/ /usr/share/nginx/html/
 COPY --from=builder /data/docs-builder/nginx.conf /etc/nginx/conf.d/default.conf
 
-# Move files into final location
-RUN cp -R /data/website/html/* /usr/share/nginx/html \
-  && rm -rf /data/website/
-
 RUN ln -s /usr/share/nginx/html /usr/share/nginx/html/2.x