diff --git a/README.md b/README.md
index 91f89f1d..0eaf4c77 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Bookstack](https://github.com/BookStackApp/BookStack) - Simple, easy-to-use platform for organising and storing information.
 - [Calibre-Web](https://github.com/janeczku/calibre-web) - Web Ebook Reader
 - [Code-Server](https://github.com/coder/code-server) - Web VS Code
+- [DokuWiki](https://github.com/dokuwiki/dokuwiki) - DokuWiki is a simple to use and highly versatile Open Source wiki software 
 - [Filebrowser](https://github.com/filebrowser/filebrowser) - Web File Browser
 - [Firefly III](https://github.com/firefly-iii/firefly-iii) - A personal finances manager
 - [Flatnotes](https://github.com/Dullage/flatnotes) - A self-hosted, database-less note taking web app
diff --git a/apps/dokuwiki/config.json b/apps/dokuwiki/config.json
new file mode 100644
index 00000000..9129efe6
--- /dev/null
+++ b/apps/dokuwiki/config.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "../schema.json",
+  "name": "DokuWiki",
+  "port": 8149,
+  "available": true,
+  "exposable": true,
+  "id": "dokuwiki",
+  "tipi_version": 1,
+  "version": "2022-07-31a-ls158",
+  "categories": ["media"],
+  "description": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.",
+  "short_desc": "DokuWiki is a simple to use and highly versatile Open Source wiki software ",
+  "author": "https://github.com/dokuwiki",
+  "source": "https://github.com/dokuwiki/dokuwiki",
+  "website": "https://www.dokuwiki.org/dokuwiki",
+  "form_fields": []
+}
diff --git a/apps/dokuwiki/docker-compose.yml b/apps/dokuwiki/docker-compose.yml
new file mode 100644
index 00000000..c4ea4a90
--- /dev/null
+++ b/apps/dokuwiki/docker-compose.yml
@@ -0,0 +1,23 @@
+version: "3"
+
+services:
+  dokuwiki:
+    container_name: dokuwiki
+    image: lscr.io/linuxserver/dokuwiki:2022-07-31a-ls158
+    ports:
+      - ${APP_PORT}:80
+    volumes:
+      - ${APP_DATA_DIR}/data/config:/config
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=${TZ}
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.dokuwiki.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.dokuwiki.entrypoints: websecure
+      traefik.http.routers.dokuwiki.service: dokuwiki
+      traefik.http.routers.dokuwiki.tls.certresolver: myresolver
+      traefik.http.services.dokuwiki.loadbalancer.server.port: 80
\ No newline at end of file
diff --git a/apps/dokuwiki/metadata/description.md b/apps/dokuwiki/metadata/description.md
new file mode 100644
index 00000000..9e3cfe74
--- /dev/null
+++ b/apps/dokuwiki/metadata/description.md
@@ -0,0 +1,8 @@
+DokuWiki - Documentation Wiki Platform
+======================================
+
+`DokuWiki`_ is wiki software aimed at small companies documentation
+needs. It works on plain text files and thus needs no database. It has a
+simple but powerful syntax (similar to the one used by MediaWiki) which
+makes sure the data files remain readable outside the wiki and eases the
+creation of structured texts.
\ No newline at end of file
diff --git a/apps/dokuwiki/metadata/logo.jpg b/apps/dokuwiki/metadata/logo.jpg
new file mode 100644
index 00000000..c07551c6
Binary files /dev/null and b/apps/dokuwiki/metadata/logo.jpg differ