diff --git a/README.md b/README.md
index b69cc9d..db2df84 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ Each app template has a `.felhom.yml` metadata file that the controller uses for
 |-----------|-------------|
 | `password:N` | N chars alphanumeric |
 | `hex:N` | N bytes hex-encoded |
+| `base64key:N` | `base64:` + N random bytes base64-encoded (Laravel APP_KEY format) |
 | `static:VAL` | Fixed value |
 
 ### Example .felhom.yml
diff --git a/templates/bookstack/.felhom.yml b/templates/bookstack/.felhom.yml
index fd490be..0f5000a 100644
--- a/templates/bookstack/.felhom.yml
+++ b/templates/bookstack/.felhom.yml
@@ -27,7 +27,7 @@ deploy_fields:
   - env_var: APP_KEY
     label: "Alkalmazás kulcs"
     type: secret
-    generate: "password:32"
+    generate: "base64key:32"
     locked_after_deploy: true
 
   - env_var: DB_PASSWORD
diff --git a/templates/bookstack/docker-compose.yml b/templates/bookstack/docker-compose.yml
index f8e40a0..e2a42cd 100644
--- a/templates/bookstack/docker-compose.yml
+++ b/templates/bookstack/docker-compose.yml
@@ -22,8 +22,8 @@ services:
       - PGID=1000
       - DB_HOST=bookstack-db
       - DB_PORT=3306
-      - DB_USER=bookstack
-      - DB_PASS=${DB_PASSWORD}
+      - DB_USERNAME=bookstack
+      - DB_PASSWORD=${DB_PASSWORD}
       - DB_DATABASE=bookstack
       - APP_KEY=${APP_KEY}
       - APP_URL=https://wiki.${DOMAIN}