diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 7a88705c5c24866fbcb5590c1ad18af8a739bc13..94f78146cd17b7f15d8e98545d5693a0313a39e7 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,31 +1,39 @@
 FROM nginx
 LABEL maintainer="antoine@barbare.me"
 
-RUN apt-get update -y
-RUN apt-get install -y \
+WORKDIR /var/www
+RUN apt-get update -y \
+    apt-get install -y \
     curl \
     tar \
     php7.0 \
     php7.0-fpm \
     php7.0-gd \
-    php7.0-xml
+    php7.0-xml; \
+    mkdir -p html; \
+    chown -R nginx:nginx /var/www/html
+
 
 USER nginx
 COPY nginx.conf /etc/nginx/nginx.conf
 
-RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php/7.0/fpm/php.ini && \
-    sed -i -e "s|;daemonize\s*=\s*yes|daemonize = no|g" /etc/php/7.0/fpm/php-fpm.conf && \
-    sed -i -e "s|listen\s*=\s*127\.0\.0\.1:9000|listen = /var/run/php-fpm7.sock|g" /etc/php/7.0/fpm/pool.d/www.conf && \
-    sed -i -e "s|;listen\.owner\s*=\s*|listen.owner = |g" /etc/php/7.0/fpm/pool.d/www.conf && \
-    sed -i -e "s|;listen\.group\s*=\s*|listen.group = |g" /etc/php/7.0/fpm/pool.d/www.conf && \
-    sed -i -e "s|;listen\.mode\s*=\s*|listen.mode = |g" /etc/php/7.0/fpm/pool.d/www.conf && \    
-
-
-WORKDIR /usr/share/nginx
-RUN curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
+RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php/7.0/fpm/php.ini; \
+    sed -i -e "s|;daemonize\s*=\s*yes|daemonize = no|g" /etc/php/7.0/fpm/php-fpm.conf; \
+    sed -i -e "s|listen\s*=\s*127\.0\.0\.1:9000|listen = /var/run/php-fpm7.sock|g" /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i -e "s|;listen\.owner\s*=\s*|listen.owner = |g" /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i -e "s|;listen\.group\s*=\s*|listen.group = |g" /etc/php/7.0/fpm/pool.d/www.conf; \
+    sed -i -e "s|;listen\.mode\s*=\s*|listen.mode = |g" /etc/php/7.0/fpm/pool.d/www.conf; \    
+    curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
     tar -xzf dokuwiki-stable.tgz -C html --strip-components 1 && \
     rm -Rf dokuwiki*
 
+USER root
+RUN apt-get remove -y tar && \
+    apt-get -y autoclean && \
+    apt-get -y clean && \
+    apt-get -y autoremove
+
+USER nginx
 EXPOSE 80
 VOLUME ["/var/www/html"]
 HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
@@ -33,11 +41,6 @@ HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
-USER root
-RUN apt-get remove -y \
-    curl \
-    tar	
-
 COPY run.sh /run.sh
 CMD ["run.sh"]