diff --git a/Images/bookstack2.png b/Images/bookstack2.png
new file mode 100644
index 0000000..fdc0a04
Binary files /dev/null and b/Images/bookstack2.png differ
diff --git a/Template/Stack/bookstack.yml b/Template/Stack/bookstack.yml
new file mode 100644
index 0000000..678fc7b
--- /dev/null
+++ b/Template/Stack/bookstack.yml
@@ -0,0 +1,34 @@
+---
+version: "2"
+services:
+  bookstack:
+    image: linuxserver/bookstack
+    container_name: bookstack
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - DB_HOST=bookstack_db
+      - DB_USER=bookstack
+      - DB_PASS=${Database_Password}
+      - DB_DATABASE=bookstackapp
+    volumes:
+      - /portainer/Files/AppData/Bookstack/Data:/config
+    ports:
+      - 6875:80
+    restart: unless-stopped
+    depends_on:
+      - bookstack_db
+  bookstack_db:
+    image: linuxserver/mariadb
+    container_name: bookstack_db
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - TZ=${Timezone}
+      - MYSQL_DATABASE=bookstackapp
+      - MYSQL_USER=bookstack
+      - MYSQL_PASSWORD=${Database_Password}
+    volumes:
+      - /portainer/Files/AppData/Bookstack/DB:/config
+    restart: unless-stopped
\ No newline at end of file
diff --git a/Template/template.json b/Template/template.json
index e683f95..a64e1b8 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -3225,5 +3225,38 @@
         "preset": true
       }
     ]
+  },
+  {
+    "type": 2,
+    "title": "bookstack",
+    "name": "bookstack",
+    "description": "Bookstack is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease.",
+    "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/bookstack2.png",
+    "categories": [
+      "Wiki"
+    ],
+    "platform": "linux",
+    "env": [
+      {
+        "name": "PUID",
+        "label": "PUID",
+        "default": "1000",
+        "preset": true
+      },
+      {
+        "name": "PGID",
+        "label": "PGID",
+        "default": "100",
+        "preset": true
+      },
+      {
+        "name": "Database_Password",
+        "label": "Database Password"
+      },
+      {
+        "name": "MYSQL_ROOT_PASSWORD",
+        "label": "MYSQL_ROOT_PASSWORD"
+      }
+    ]
   }
 ]
\ No newline at end of file