diff --git a/tx-apache/Dockerfile b/tx-apache/Dockerfile
index bd6ed3515423145f11a8b966cc64c4b1218903e3..fa9b27e04cf27323fe7093575bdb970d37f766cd 100644
--- a/tx-apache/Dockerfile
+++ b/tx-apache/Dockerfile
@@ -1,5 +1,5 @@
-FROM pica-debian
-MAINTAINER antoinebarbare@gmail.com
+FROM registry.picasoft.net:5000/pica-debian
+MAINTAINER antoine@barbare.me
 
 # Install base packages
 RUN apt-get update && \
diff --git a/tx-dokuwiki/Dockerfile b/tx-dokuwiki/Dockerfile
index 0678fe7f5a2edf70a4a3718da94960d7bebf0c82..b3336ac066b922b841cdeb935e72ecd0f162fcdc 100644
--- a/tx-dokuwiki/Dockerfile
+++ b/tx-dokuwiki/Dockerfile
@@ -1,31 +1,14 @@
-FROM pica-debian
+FROM registry.picasoft.net:5000/pica-nginx
 MAINTAINER antoine@barbare.me
 
-RUN echo "deb http://packages.dotdeb.org jessie all" > /etc/apt/sources.list.d/dotdeb.list && \
-wget -O- https://www.dotdeb.org/dotdeb.gpg | apt-key add - && \
-apt-get update -y && apt-get install -y php7.0 php7.0-fpm php7.0-gd php7.0-xml nginx supervisor curl tar
-
-RUN mkdir -p /run/nginx && \
-    mkdir -p /var/www && \
-    cd /var/www && \
+RUN cd /var/www && \
     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*
 
-
 ADD nginx.conf /etc/nginx/nginx.conf
-ADD supervisord.conf /etc/supervisord.conf
-ADD start.sh /start.sh
-
-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 && \    
-    chmod +x /start.sh
 
 EXPOSE 80
-VOLUME ["/var/www"]
+VOLUME ["/var/www/html"]
 
 CMD /start.sh
diff --git a/tx-dokuwiki/start.sh b/tx-dokuwiki/start.sh
deleted file mode 100755
index 3fab0158c88fd216280daa5cc876aa01e7f46950..0000000000000000000000000000000000000000
--- a/tx-dokuwiki/start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-chown -R www-data /var/www
-
-exec /usr/bin/supervisord -c /etc/supervisord.conf
diff --git a/tx-dokuwiki/supervisord.conf b/tx-dokuwiki/supervisord.conf
deleted file mode 100644
index 92bca8b43772e9a80ecce99b2d27d7fca708fe46..0000000000000000000000000000000000000000
--- a/tx-dokuwiki/supervisord.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[supervisorctl]
-serverurl=unix:///var/run/supervisor.sock
-
-[unix_http_server]
-file=/var/run/supervisor.sock
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[program:php]
-command=/usr/sbin/php-fpm7.0
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-
-[program:nginx]
-command=/usr/sbin/nginx
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-redirect_stderr=true
diff --git a/tx-kanboard/Dockerfile b/tx-kanboard/Dockerfile
index 8ad6ce18237fcb015433ef9c28a6ad69b324a50d..e4e01d6c62b550e881d888758637f237bccc5cd5 100644
--- a/tx-kanboard/Dockerfile
+++ b/tx-kanboard/Dockerfile
@@ -1,23 +1,17 @@
-FROM pica-apache
-MAINTAINER antoinebarbare@gmail.com
+FROM registry.picasoft.net:5000/pica-nginx
+MAINTAINER antoine@barbare.me
 
-# Install base packages
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -yq install \
-    php5-sqlite \
-    unzip \
-    wget 
+RUN apt-get update -y && apt-get install -y php7.0-mbstring php7.0-sqlite3 unzip
 
-WORKDIR /var/www/html
-RUN rm -Rf *
+RUN cd /var/www && \
+    curl -O -L "http://kanboard.net/kanboard-latest.zip" && \
+    unzip kanboard-latest.zip && \
+    rm -Rf kanboard-latest.zip && \
+    rm -Rf html && \
+    mv kanboard html && \
+    chown -R www-data:www-data /var/www/html
 
-RUN wget http://kanboard.net/kanboard-latest.zip
-RUN unzip kanboard-latest.zip
-RUN mv kanboard kanboard2
-RUN cp -R kanboard2/* .
-RUN rm -Rf kanboard2 kanboard-latest.zip
+EXPOSE 80
+VOLUME ["/var/www","/var/www/html/data"]
 
-RUN chown -R www-data:www-data *
-VOLUME /var/www/html/data
-
-CMD ["/run.sh"]
+CMD /start.sh
diff --git a/tx-nginx/Dockerfile b/tx-nginx/Dockerfile
index 4b95a4b66069021bd1ae8fac43795286a9c4de30..fe87fb15c54ffba4080153df6854e4c234a37ee5 100644
--- a/tx-nginx/Dockerfile
+++ b/tx-nginx/Dockerfile
@@ -21,6 +21,6 @@ RUN echo "cgi.fix_pathinfo = 0;" >> /etc/php/7.0/fpm/php.ini && \
     chmod +x /start.sh
 
 EXPOSE 80
-VOLUME ["/var/www"]
+#VOLUME ["/var/www/","/var/www/html/"]
 
 CMD /start.sh