diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 143379a92eee650ece25d94d86d39206a4f9961d..daf4d077d1563a66b9b2e408b6e04e5e652c652d 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,5 +1,5 @@
 FROM registry.picasoft.net:5000/pica-nginx
-MAINTAINER antoine@barbare.me
+LABEL maintainer="antoine@barbare.me"
 
 RUN cd /var/www && \
     curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
@@ -11,5 +11,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 EXPOSE 80
 VOLUME ["/var/www/html"]
+HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/pica-dokuwiki/docker-compose.yml b/pica-dokuwiki/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7f50b7f1f1f5b497d5202118b006c426d42a4c29
--- /dev/null
+++ b/pica-dokuwiki/docker-compose.yml
@@ -0,0 +1,19 @@
+  wiki:
+    container_name: wiki
+    image: registry.picasoft.net:5000/pica-dokuwiki:2018.05
+    volumes:
+      - /DATA/docker/wiki/html:/var/www/html
+    environment:
+      - MAX_UPLOAD_SIZE=100M
+    security_opt:
+      - no-new-privileges
+    mem_limit: 2048m
+    cpus: "0.20"
+    pids_limit: 1024
+    labels:
+      - "traefik.frontend.rule=Host:wiki.picasoft.net"
+      - "traefik.port=80"
+      - "traefik.enable=true"
+    env_file: ./wiki.secrets
+    restart: always
+