diff --git a/pi-hosted_template/template/portainer-v2.json b/pi-hosted_template/template/portainer-v2.json
index c0cbd0c..8df2356 100644
--- a/pi-hosted_template/template/portainer-v2.json
+++ b/pi-hosted_template/template/portainer-v2.json
@@ -1796,8 +1796,8 @@
 			"note": "Default login is admin@admin.com with a password of password. The database created is called bookstackapp and the database user is called bookstack",
 			"platform": "linux",
 			"repository": {
-				"stackfile": "Template/Stack/bookstack.yml",
-				"url": "https://github.com/SelfhostedPro/selfhosted_templates"
+				"stackfile": "stack/bookstack.yml",
+				"url": "https://github.com/novaspirit/pi-hosted"
 			},
 			"title": "Bookstack",
 			"type": 3
diff --git a/stack/bookstack.yml b/stack/bookstack.yml
new file mode 100644
index 0000000..ea489cc
--- /dev/null
+++ b/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/Config/Bookstack/Data:/config
+    ports:
+      - ${PORT}: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/Config/Bookstack/DB:/config
+    restart: unless-stopped
diff --git a/stack/pritunl.yml b/stack/pritunl.yml
new file mode 100644
index 0000000..ce16755
--- /dev/null
+++ b/stack/pritunl.yml
@@ -0,0 +1,36 @@
+---
+version: '2'
+
+services:
+  mongo:
+    image: mongo:latest
+    container_name: pritunldb
+    hostname: pritunldb
+    network_mode: bridge
+    volumes:
+      - /portainer/Files/AppData/Config/Pritunl/db:/data/db
+
+  pritunl:
+    image: goofball222/pritunl:latest
+    container_name: pritunl
+    hostname: pritunl
+    depends_on:
+        - mongo
+    network_mode: bridge
+    privileged: true
+    links:
+      - mongo
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - 80:80
+      - 443:443
+      - 1194:1194
+      - 1194:1194/udp
+      - 1195:1195/udp
+    environment:
+      - TZ=UTC
+      - REVERSE_PROXY=${REVERSE_PROXY}
+      - PRITUNL_OPTS=${PRITUNL_OPTS}
+      - MONGODB_URI=${MONGODB_URI}
+      - WIREGUARD=${WIREGUARD}
diff --git a/template/portainer-v2-arm32.json b/template/portainer-v2-arm32.json
index c0cbd0c..8df2356 100644
--- a/template/portainer-v2-arm32.json
+++ b/template/portainer-v2-arm32.json
@@ -1796,8 +1796,8 @@
 			"note": "Default login is admin@admin.com with a password of password. The database created is called bookstackapp and the database user is called bookstack",
 			"platform": "linux",
 			"repository": {
-				"stackfile": "Template/Stack/bookstack.yml",
-				"url": "https://github.com/SelfhostedPro/selfhosted_templates"
+				"stackfile": "stack/bookstack.yml",
+				"url": "https://github.com/novaspirit/pi-hosted"
 			},
 			"title": "Bookstack",
 			"type": 3
diff --git a/template/portainer-v2-arm64.json b/template/portainer-v2-arm64.json
index 1b13f49..c15867d 100644
--- a/template/portainer-v2-arm64.json
+++ b/template/portainer-v2-arm64.json
@@ -1796,8 +1796,8 @@
 			"note": "Default login is admin@admin.com with a password of password. The database created is called bookstackapp and the database user is called bookstack",
 			"platform": "linux",
 			"repository": {
-				"stackfile": "Template/Stack/bookstack.yml",
-				"url": "https://github.com/SelfhostedPro/selfhosted_templates"
+				"stackfile": "stack/bookstack.yml",
+				"url": "https://github.com/novaspirit/pi-hosted"
 			},
 			"title": "Bookstack",
 			"type": 3
@@ -3047,11 +3047,11 @@
 			],
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/images/pritunl.png",
 			"name": "pritunl",
-			"note": "[Arm64 only][Use Stack file from Selfhosted] Documentation on this containier can be found here: \u003ca href=https://hub.docker.com/r/goofball222/pritunl\u003ehttps://hub.docker.com/r/goofball222/pritunl\u003c/a\u003e",
+			"note": "Documentation on this containier can be found here: \u003ca href=https://hub.docker.com/r/goofball222/pritunl\u003ehttps://hub.docker.com/r/goofball222/pritunl\u003c/a\u003e",
 			"platform": "linux",
 			"repository": {
-				"stackfile": "Template/Stack/pritunl.yml",
-				"url": "https://github.com/SelfhostedPro/selfhosted_templates"
+				"stackfile": "stack/pritunl.yml",
+				"url": "https://github.com/novaspirit/pi-hosted"
 			},
 			"title": "Pritunl",
 			"type": 3