diff --git a/README.md b/README.md
index b77c4907..56a94d77 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,7 @@ This is the official repository for the Tipi App Store. It contains all the apps
 - [Vaultwarden](https://github.com/dani-garcia/vaultwarden) - Unofficial Bitwarden compatible server
 - [Vikunja](https://kolaente.dev/vikunja/) - The open-source, self-hostable to-do app. Organize everything, on all platforms.
 - [Wireguard Easy](https://github.com/WeeJeWel/wg-easy) - WireGuard VPN + Web-based Admin UI
+- [WikiJS](https://github.com/requarks/wiki) - A modern and powerful wiki app built on Node.js
 - [Your Spotify](https://github.com/Yooooomi/your_spotify) - Self hosted Spotify tracking dashboard
 - [ZeroTier](https://github.com/zerotier/ZeroTierOne) - Easy to use zero configuration VPN.
 - [Zipline](https://github.com/diced/zipline) - A ShareX/file upload server that is easy to use, packed with features, and with an easy setup!
diff --git a/apps/wikijs/config.json b/apps/wikijs/config.json
new file mode 100644
index 00000000..0efce7f6
--- /dev/null
+++ b/apps/wikijs/config.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "../schema.json",
+  "name": "WikiJS",
+  "port": 8148,
+  "available": true,
+  "exposable": true,
+  "id": "wikijs",
+  "tipi_version": 1,
+  "version": "2.5.297",
+  "categories": ["media"],
+  "description": "A modern, lightweight and powerful wiki app built on NodeJS ",
+  "short_desc": "A modern and powerful wiki app built on Node.js",
+  "author": "https://github.com/requarks",
+  "source": "https://github.com/requarks/wiki",
+  "website": "https://js.wiki/",
+  "form_fields": [
+    {
+      "type": "random",
+      "label": "WIKI_JS_DB_PASS",
+      "min": 32,
+      "env_variable": "WIKI_JS_DB_PASS"
+    }
+  ]
+}
diff --git a/apps/wikijs/docker-compose.yml b/apps/wikijs/docker-compose.yml
new file mode 100644
index 00000000..e76dc84b
--- /dev/null
+++ b/apps/wikijs/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '3.7'
+
+services:
+  wikijs:
+    container_name: wikijs
+    image: ghcr.io/requarks/wiki:2.5.297
+    depends_on:
+      - wikijs-db
+    environment:
+      DB_TYPE: postgres
+      DB_HOST: wikijs-db
+      DB_PORT: 5432
+      DB_USER: wikijs
+      DB_PASS: ${WIKI_JS_DB_PASS}
+      DB_NAME: wiki
+    restart: unless-stopped
+    ports:
+      - ${APP_PORT}:3000
+    networks:
+      - tipi_main_network
+    labels:
+      traefik.enable: ${APP_EXPOSED}
+      traefik.http.routers.wikijs.rule: Host(`${APP_DOMAIN}`)
+      traefik.http.routers.wikijs.entrypoints: websecure
+      traefik.http.routers.wikijs.service: wikijs
+      traefik.http.routers.wikijs.tls.certresolver: myresolver
+      traefik.http.services.wikijs.loadbalancer.server.port: 3000
+
+  wikijs-db:
+    container_name: wikijs-db
+    image: postgres:11-alpine
+    environment:
+      POSTGRES_DB: wiki
+      POSTGRES_PASSWORD: ${WIKI_JS_DB_PASS}
+      POSTGRES_USER: wikijs
+    logging:
+      driver: 'none'
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+    volumes:
+      - ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
diff --git a/apps/wikijs/metadata/description.md b/apps/wikijs/metadata/description.md
new file mode 100644
index 00000000..088edbff
--- /dev/null
+++ b/apps/wikijs/metadata/description.md
@@ -0,0 +1,20 @@
+[![Wiki.js](https://camo.githubusercontent.com/620ef2ce5831c2e1a03aaa55721d0eb9be6c5fb678a284a9dd5ad4976413974f/68747470733a2f2f7374617469632e7265717561726b732e696f2f6c6f676f2f77696b696a732d66756c6c2e737667)](https://camo.githubusercontent.com/620ef2ce5831c2e1a03aaa55721d0eb9be6c5fb678a284a9dd5ad4976413974f/68747470733a2f2f7374617469632e7265717561726b732e696f2f6c6f676f2f77696b696a732d66756c6c2e737667)
+
+##### [](https://github.com/requarks/wiki/blob/main/README.md#a-modern-lightweight-and-powerful-wiki-app-built-on-nodejs)A modern, lightweight and powerful wiki app built on NodeJS
+
+- **[Official Website](https://js.wiki/)**
+- **[Documentation](https://docs.requarks.io/)**
+- [Requirements](https://docs.requarks.io/install/requirements)
+- [Installation](https://docs.requarks.io/install)
+- [Demo](https://docs.requarks.io/demo)
+- [Changelog](https://github.com/requarks/wiki/releases)
+- [Feature Requests](https://feedback.js.wiki/wiki)
+- [Chat with us on Slack](https://wiki.requarks.io/slack)
+- [Translations](https://docs.requarks.io/dev/translations) _(We need your help!)_
+- [E2E Testing Results](https://dashboard.cypress.io/projects/r7qxah/runs)
+- [Special Thanks](https://github.com/requarks/wiki/blob/main/README.md#special-thanks)
+- [Contribute](https://github.com/requarks/wiki/blob/main/README.md#contributors)
+
+[Follow our Twitter feed](https://twitter.com/requarks) to learn about upcoming updates and new releases!
+
+## [](https://github.com/requarks/wiki/blob/main/README.md#donate)
diff --git a/apps/wikijs/metadata/logo.jpg b/apps/wikijs/metadata/logo.jpg
new file mode 100644
index 00000000..57cf90cb
Binary files /dev/null and b/apps/wikijs/metadata/logo.jpg differ