diff --git a/docker/dokuwiki/Containerfile b/docker/dokuwiki/Containerfile
new file mode 100644
index 0000000..0fc0af9
--- /dev/null
+++ b/docker/dokuwiki/Containerfile
@@ -0,0 +1,13 @@
+FROM docker.io/library/debian:latest
+ARG WIKI_NAME="dokuwiki"
+ARG WEB_DIR="/var/www"
+ARG APACHE_CONFIG_DIR="/etc/apache2"
+EXPOSE 443/tcp
+
+USER root
+
+RUN apt-get update && apt-get full-upgrade -y && apt-get install vim apache2 libapache2-mod-php w3m php-cli php-xml -y
+RUN rm ${APACHE_CONFIG_DIR}/sites-enabled/000-default.conf && a2enmod ssl
+RUN ["/bin/bash", "-c", "echo 'date.timezone = \"Europe/Madrid\"' >> /etc/php/*/apache2/php.ini"]
+
+STOPSIGNAL SIGWINCH
diff --git a/docker/dokuwiki/docker-compose.yml b/docker/dokuwiki/docker-compose.yml
new file mode 100644
index 0000000..673933d
--- /dev/null
+++ b/docker/dokuwiki/docker-compose.yml
@@ -0,0 +1,25 @@
+services:
+ wiki:
+  name: hane-dokuwiki
+  image: git.roboces.dev/hane/fukuops/hane-dokuwiki-image:latest
+  volumes:
+   - type: volume
+     source: dokuwiki
+     target: /var/www/dokuwiki
+   - type: bind
+     source: /mnt/nas1/shared/dokuwiki/apache2.conf
+     target: /etc/apache2/apache2.conf
+   - type: bind
+     source: /mnt/nas1/shared/dokuwiki/001-wiki.conf
+     target: /etc/apache2/sites-enabled/001-wiki.conf
+   - /mnt/nas1/shared/dokuwiki/init.sh:/init.sh
+  ports:
+   - "44344:443/tcp"
+  entrypoint: /init.sh
+
+volumes:
+ dokuwiki:
+  external:  true
+  labels:
+   - "dev.roboces.wiki=Dokuwiki volume"
+  name: dokuwiki
diff --git a/docker/netbird/docker-compose.yml b/docker/netbird/docker-compose.yml
index 307f2ea..4a93255 100644
--- a/docker/netbird/docker-compose.yml
+++ b/docker/netbird/docker-compose.yml
@@ -91,7 +91,7 @@ services:
         max-file: "2"
 
   peer-1:
-    image: netbirdio/netbird:0.59.0
+    image: netbirdio/netbird:0.59.8
     restart: unless-stopped
     volumes:
       - ${NETBIRD_PEER_VOLUME:-/mnt/nas1/shared/netbird/peer-1}/data:/etc/netbird