diff --git a/.env.default b/.env.default
index dd7ccff..bcd28e5 100644
--- a/.env.default
+++ b/.env.default
@@ -18,7 +18,7 @@ HOST_SELFOSS=selfoss
 HOST_BAIKAL=baikal
 HOST_PIGALLERY=pigallery
 HOST_WIKIJS=wikijs
-HOST_TYPEMILL=typemill
+HOST_DOKUWIKI=dokuwiki
 # other
 TZ=Europe/Paris
 BASIC_AUTH=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/
@@ -27,8 +27,6 @@ DOWNLOAD_HTTP_PORT=8000
 ROOT_INSTALL=/srv
 DB_ROOT_PASSWORD=rootpassword
 ADMIN_EMAIL=root@localdomain
-PUID=1000
-GUID=1000
 # seafile
 SEAFILE_ADMIN_PASSWORD=abc123456
 SEAFILE_REGULAR_USER=johndoe
diff --git a/dokuwiki/docker-compose.dokuwiki.yml b/dokuwiki/docker-compose.dokuwiki.yml
new file mode 100644
index 0000000..7ca141f
--- /dev/null
+++ b/dokuwiki/docker-compose.dokuwiki.yml
@@ -0,0 +1,38 @@
+version: '3'
+
+services:
+
+  seafcli-notes:
+    image: snegov/seafile-client
+    container_name: seafcli-notes
+    restart: unless-stopped
+    environment:
+      - LIBRARY_ID=${SEAFILE_NOTES_LIBRARY}
+      - SERVER_HOST=${HOST_SEAFILE}.${DOMAIN}
+      - SERVER_PORT=443
+      - USERNAME=${SEAFILE_REGULAR_USER}
+      - PASSWORD=${SEAFILE_REGULAR_PASSWORD}
+      - DATA_DIR=/library
+    networks:
+      - srv      
+    volumes:
+      - ${ROOT_INSTALL}/data/sync_notes:/library
+
+  dokuwiki:
+    image: 'docker.io/bitnami/dokuwiki:20200729-debian-10'
+    container_name: dokuwiki
+    restart: unless-stopped
+    expose:
+      - 8080
+    volumes:
+      - ${ROOT_INSTALL}/data/sync_notes/Notes:/bitnami/dokuwiki
+    networks:
+      - srv    
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.dokuwiki.rule=Host(`${HOST_DOKUWIKI}.${DOMAIN}`)
+      - traefik.http.routers.dokuwiki.entrypoints=websecure
+      - traefik.http.routers.dokuwiki.tls=true
+      - traefik.http.services.dokuwiki.loadbalancer.server.port=8080
+
+
diff --git a/typemill/docker-compose.typemill.yml b/typemill/docker-compose.typemill.yml
deleted file mode 100644
index 82f1b9a..0000000
--- a/typemill/docker-compose.typemill.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-version: '3'
-
-services:
-
-  seafcli-notes:
-    image: snegov/seafile-client
-    container_name: seafcli-notes
-    restart: unless-stopped
-    environment:
-      - LIBRARY_ID=${SEAFILE_NOTES_LIBRARY}
-      - SERVER_HOST=${HOST_SEAFILE}.${DOMAIN}
-      - SERVER_PORT=443
-      - USERNAME=${SEAFILE_REGULAR_USER}
-      - PASSWORD=${SEAFILE_REGULAR_PASSWORD}
-      - DATA_DIR=/library
-    networks:
-      - srv      
-    volumes:
-      - ${ROOT_INSTALL}/data/sync_notes:/library
-
-  typemill:
-    image: aberty/typemill-docker
-    container_name: typemill
-    environment:
-      - TYPEMILL_UID=${PUID}
-      - TYPEMILL_GID=${GUID}
-      - TZ=${TZ}
-    volumes:
-      - ${ROOT_INSTALL}/data/typemill/settings:/var/www/html/settings
-      - ${ROOT_INSTALL}/data/typemill/cache:/var/www/html/cache
-      - ${ROOT_INSTALL}/data/typemill/media:/var/www/html/media
-      - ${ROOT_INSTALL}/data/sync_notes/Notes:/var/www/html/content
-    expose:
-      - 80
-    restart: unless-stopped
-    networks: 
-      - srv    
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.typemill.rule=Host(`${HOST_TYPEMILL}.${DOMAIN}`)
-      - traefik.http.routers.typemill.entrypoints=websecure
-      - traefik.http.routers.typemill.tls=true
-      - traefik.http.services.typemill.loadbalancer.server.port=80