diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 8f23c316d74dd1ecba4c1ad6f161cc3abc4c4cdb..bc2ce310fa8164d4d6477b2282f814d17fd76a86 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -22,18 +22,21 @@ RUN apt-get update && \
       pkg-config \
       python \
       unzip && \
-    curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip > etherpad.zip && \
+    mkdir -p /opt/etherpad-lite && \
+    chown -R node /opt/etherpad-lite
+
+USER node
+WORKDIR /opt/etherpad-lite
+RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip > etherpad.zip && \
     unzip etherpad && \
     rm -Rf etherpad.zip etherpad-lite-${ETHERPAD_VERSION}/.git && \
-    mv etherpad-lite-${ETHERPAD_VERSION} /opt/etherpad-lite && \
-    mkdir -p /opt/etherpad-lite/src/templates && \
-    mkdir -p /opt/etherpad-lite/static && \
-    cd /opt/etherpad-lite/src/templates && \
-    git clone https://framagit.org/DeBugs/picasoft-etherpad-landing-page.git && \
-    cd ./picasoft-etherpad-landing-page/ && \
-    git checkout ${ETHERPAD_LANDING_PAGE_VERSION} && \
-    cp ./index.html ../index.html && \
-    cp ./static/* ../../static/ -r
+    mv etherpad-lite-${ETHERPAD_VERSION}/* . && \
+    mkdir -p src/templates && \
+    mkdir -p static && \
+    git clone https://framagit.org/DeBugs/picasoft-etherpad-landing-page.git src/templates/picasoft-etherpad-landing-page && \
+    git --git-dir=src/templates/picasoft-etherpad-landing-page/.git checkout ${ETHERPAD_LANDING_PAGE_VERSION} && \
+    cp src/templates/picasoft-etherpad-landing-page/index.html src/templates/index.html && \
+    cp src/templates/picasoft-etherpad-landing-page/static/* static/ -r
 
 
 # construction de l'image finale