diff --git a/Template/Stack/bookstack.yml b/Template/Stack/bookstack.yml
index 678fc7b..a44f27d 100644
--- a/Template/Stack/bookstack.yml
+++ b/Template/Stack/bookstack.yml
@@ -9,12 +9,12 @@ services:
       - PGID=${PGID}
       - DB_HOST=bookstack_db
       - DB_USER=bookstack
-      - DB_PASS=${Database_Password}
+      - DB_PASS=${DATABASE_PASSWORD}
       - DB_DATABASE=bookstackapp
     volumes:
       - /portainer/Files/AppData/Bookstack/Data:/config
     ports:
-      - 6875:80
+      - ${PORT}:80
     restart: unless-stopped
     depends_on:
       - bookstack_db
@@ -28,7 +28,7 @@ services:
       - TZ=${Timezone}
       - MYSQL_DATABASE=bookstackapp
       - MYSQL_USER=bookstack
-      - MYSQL_PASSWORD=${Database_Password}
+      - 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 53c00a1..a78c0fd 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -3293,9 +3293,8 @@
     ]
   },
   {
-    "type": 2,
+    "type": 3,
     "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": [
@@ -3320,12 +3319,16 @@
         "preset": true
       },
       {
-        "name": "Database_Password",
-        "label": "Database Password"
+        "name": "DATABASE_PASSWORD",
+        "label": "DATABASE_PASSWORD"
       },
       {
         "name": "MYSQL_ROOT_PASSWORD",
         "label": "MYSQL_ROOT_PASSWORD"
+      },
+      {
+        "name": "PORT",
+        "label": "PORT"
       }
     ]
   }