diff --git a/apps/bookstack/config.json b/apps/bookstack/config.json
new file mode 100644
index 00000000..490eede8
--- /dev/null
+++ b/apps/bookstack/config.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "../schema.json",
+  "name": "Bookstack",
+  "available": true,
+  "port": 8119,
+  "id": "bookstack",
+  "tipi_version": 1,
+  "version": "22.07.3",
+  "description": "BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information. Default login: admin@admin.com password: password",
+  "short_desc": "BookStack is a self-hosted platform for organising and storing information.",
+  "author": "Dan Brown",
+  "categories": ["Data"],
+  "website": "https://www.bookstackapp.com/",
+  "source": "https://github.com/BookStackApp/BookStack",
+  "form_fields": [
+    {
+      "type": "random",
+      "label": "Database password",
+      "required": false,
+      "min": 30,
+      "max": 30,
+      "env_variable": "BOOKSTACK_DB_PASS"
+    }
+  ]
+}
diff --git a/apps/bookstack/docker-compose.yml b/apps/bookstack/docker-compose.yml
new file mode 100644
index 00000000..86521cb5
--- /dev/null
+++ b/apps/bookstack/docker-compose.yml
@@ -0,0 +1,40 @@
+
+version: "3.9"
+services:
+  bookstack:
+    image: lscr.io/linuxserver/bookstack:22.07.3
+    container_name: bookstack
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - APP_URL=${INTERNAL_IP}:${APP_PORT}
+      - DB_HOST=bookstack_db
+      - DB_USER=tipi
+      - DB_PASS=${BOOKSTACK_DB_PASS}
+      - DB_DATABASE=bookstackapp
+    volumes:
+      - ${APP_DATA_DIR}/data/config:/config
+    ports:
+      - ${APP_PORT}:80
+    restart: unless-stopped
+    depends_on:
+      - bookstack-db
+    networks:
+      - tipi_main_network
+
+  bookstack-db:
+    image: lscr.io/linuxserver/mariadb
+    container_name: bookstack-db
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - MYSQL_ROOT_PASSWORD=${BOOKSTACK_DB_PASS}
+      - TZ=${TZ}
+      - MYSQL_DATABASE=bookstackapp
+      - MYSQL_USER=tipi
+      - MYSQL_PASSWORD=${BOOKSTACK_DB_PASS}
+    volumes:
+      - ${APP_DATA_DIR}/data/db:/config
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
\ No newline at end of file
diff --git a/apps/bookstack/metadata/description.md b/apps/bookstack/metadata/description.md
new file mode 100644
index 00000000..26e6335b
--- /dev/null
+++ b/apps/bookstack/metadata/description.md
@@ -0,0 +1,5 @@
+BookStack is an opinionated wiki system that provides a pleasant and simple out-of-the-box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
+
+BookStack is not designed as an extensible platform to be used for purposes that differ to the statement above.
+
+In regard to development philosophy, BookStack has a relaxed, open & positive approach. At the end of the day this is free software developed and maintained by people donating their own free time.
\ No newline at end of file
diff --git a/apps/bookstack/metadata/logo.jpg b/apps/bookstack/metadata/logo.jpg
new file mode 100644
index 00000000..de8aa4d1
Binary files /dev/null and b/apps/bookstack/metadata/logo.jpg differ