diff --git a/jellyfin/jellyfin-secret.json b/jellyfin/jellyfin-secret.json
index 2132d26..83a79aa 100644
--- a/jellyfin/jellyfin-secret.json
+++ b/jellyfin/jellyfin-secret.json
@@ -1,6 +1,6 @@
 {
     "jellyfin": {
-        "USER": "#JELLYFIN_USER",
-        "PASS": "#JELLYFIN_PASS"
+        "USER": "#USER",
+        "PASS": "#PASS"
     }
 }
\ No newline at end of file
diff --git a/leantime/leantime-secret.json b/leantime/leantime-secret.json
index fb79013..b6e0c0c 100644
--- a/leantime/leantime-secret.json
+++ b/leantime/leantime-secret.json
@@ -1,15 +1,15 @@
 {
     "leantimemysql": {
-        "MARIADB_DATABASE": "#DB_MYSQL",
-        "MARIADB_USER": "#DB_USER",
-        "MARIADB_PASSWORD": "#DB_PASSWORD",
-        "MARIADB_ROOT_PASSWORD": "#DB_ROOT_PASSWORD"
+        "MARIADB_DATABASE": "#MARIADB_DATABASE",
+        "MARIADB_USER": "#MARIADB_USER",
+        "MARIADB_PASSWORD": "#MARIADB_PASSWORD",
+        "MARIADB_ROOT_PASSWORD": "#MARIADB_ROOT_PASSWORD"
     },
     "leantimeapp": {
-        "LEAN_DB_USER": "#DB_USER",
-        "LEAN_DB_PASSWORD": "#DB_PASSWORD",
+        "LEAN_DB_USER": "#MARIADB_USER",
+        "LEAN_DB_PASSWORD": "#MARIADB_PASSWORD",
         "LEAN_DB_HOST": "leantimemysql-db",
-        "LEAN_DB_DATABASE": "#DB_MYSQL",
+        "LEAN_DB_DATABASE": "#MARIADB_DATABASE",
         "LEAN_OIDC_CLIENT_SECRET": "#OIDC_CLIENT_SECRET",
         "LEAN_S3_SECRET": "#S3_SECRET",
         "LEAN_SESSION_PASSWORD": "#SESSION_PASSWORD"
diff --git a/leantime/template.json b/leantime/template.json
index d0358af..3f8c670 100644
--- a/leantime/template.json
+++ b/leantime/template.json
@@ -35,28 +35,28 @@
         },
         {
             "description": "MYSQL database name",
-            "key": "DB_MYSQL",
+            "key": "MARIADB_DATABASE",
             "value": "",
             "required": "true",
             "generated": "time|md5|10"
         },
         {
             "description": "MYSQL username",
-            "key": "DB_USER",
+            "key": "MARIADB_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "MYSQL password for user",
-            "key": "DB_PASSWORD",
+            "key": "MARIADB_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
             "description": "MYSQL root user password",
-            "key": "DB_ROOT_PASSWORD",
+            "key": "MARIADB_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"
diff --git a/outline/outline-secret.json b/outline/outline-secret.json
index 17842d0..4b9e2ad 100644
--- a/outline/outline-secret.json
+++ b/outline/outline-secret.json
@@ -1,13 +1,14 @@
 {
     "outlinepostgres": {
-        "POSTGRES_DB": "#DB_NAME",
-        "POSTGRES_USER": "#DB_USER",
-        "POSTGRES_PASSWORD": "#DB_PASSWORD"
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
     "outlineapp": {
         "SECRET_KEY": "#SECRET_KEY",
         "UTILS_SECRET": "#UTILS_SECRET",
-        "DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@outlinepostgres-db:5432/#DB_NAME",
+        "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@outlinepostgres-db:5432/#POSTGRES_DB",
         "SLACK_CLIENT_ID": "#SLACK_CLIENT_ID",
         "SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET",
         "GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID",
diff --git a/outline/template.json b/outline/template.json
index 23440b6..dce8796 100644
--- a/outline/template.json
+++ b/outline/template.json
@@ -21,28 +21,28 @@
         },
         {
             "description": "Postgres database name",
-            "key": "DB_NAME",
+            "key": "POSTGRES_DB",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "Postgres username",
-            "key": "DB_USER",
+            "key": "POSTGRES_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "Postgres password for user",
-            "key": "DB_PASSWORD",
+            "key": "POSTGRES_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
             "description": "Postgres root user password",
-            "key": "DB_ROOT_PASSWORD",
+            "key": "POSTGRES_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"
diff --git a/quackback/quackback-secret.json b/quackback/quackback-secret.json
index 6b99217..c560b41 100644
--- a/quackback/quackback-secret.json
+++ b/quackback/quackback-secret.json
@@ -1,9 +1,9 @@
 {
     "quackbackpostgres": {
-        "POSTGRES_DB": "#DB_NAME",
-        "POSTGRES_USER": "#DB_USER",
-        "POSTGRES_PASSWORD": "#DB_PASSWORD",
-        "POSTGRES_ROOT_PASSWORD": "#DB_ROOT_PASSWORD"
+        "POSTGRES_DB": "#POSTGRES_DB",
+        "POSTGRES_USER": "#POSTGRES_USER",
+        "POSTGRES_PASSWORD": "#POSTGRES_PASSWORD",
+        "POSTGRES_ROOT_PASSWORD": "#POSTGRES_ROOT_PASSWORD"
     },
     "quackbackminio": {
         "MINIO_ROOT_USER": "#MINIO_ROOT_USER",
@@ -12,7 +12,7 @@
     "quackbackapp": {
         "SECRET_KEY": "#SECRET_KEY",
         "UTILS_SECRET": "#UTILS_SECRET",
-        "DATABASE_URL": "postgres://#DB_USER:#DB_PASSWORD@quackbackpostgres-db:5432/#DB_NAME",
+        "DATABASE_URL": "postgres://#POSTGRES_USER:#POSTGRES_PASSWORD@quackbackpostgres-db:5432/#POSTGRES_DB",
         "SLACK_CLIENT_ID": "#SLACK_CLIENT_ID",
         "SLACK_CLIENT_SECRET": "#SLACK_CLIENT_SECRET",
         "GOOGLE_CLIENT_ID": "#GOOGLE_CLIENT_ID",
diff --git a/quackback/template.json b/quackback/template.json
index 18e354a..cdddae8 100644
--- a/quackback/template.json
+++ b/quackback/template.json
@@ -21,28 +21,28 @@
         },
         {
             "description": "Postgres database name",
-            "key": "DB_NAME",
+            "key": "POSTGRES_DB",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "Postgres username",
-            "key": "DB_USER",
+            "key": "POSTGRES_USER",
             "value": "",
             "required": "true",
             "generated": "time|md5|8"
         },
         {
             "description": "Postgres password for user",
-            "key": "DB_PASSWORD",
+            "key": "POSTGRES_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|md5|12"
         },
         {
             "description": "Postgres root user password",
-            "key": "DB_ROOT_PASSWORD",
+            "key": "POSTGRES_ROOT_PASSWORD",
             "value": "",
             "required": "true",
             "generated": "random|sha256|20"