diff --git a/LeanTime/domain-leantime.json b/LeanTime/domain-leantime.json
index 869b936..95b5d59 100644
--- a/LeanTime/domain-leantime.json
+++ b/LeanTime/domain-leantime.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "leantime",
-        "DOMAIN": "#LEANTIME_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -32,7 +32,7 @@
                     "LOCATION": "#LEANTIME_LOCATION_PATH"
                 },
                 {
-                    "DOMAIN": "#LEANTIME_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/LeanTime/service-leantime.json b/LeanTime/service-leantime.json
index 6709c33..23dec3e 100644
--- a/LeanTime/service-leantime.json
+++ b/LeanTime/service-leantime.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "leantime",
-        "DOMAIN": "#LEANTIME_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -150,7 +150,7 @@
                     "LEAN_PORT": "80"
                 },
                 {
-                    "LEAN_APP_URL": "https://#LEANTIME_DOMAIN"
+                    "LEAN_APP_URL": "https://#DOMAIN"
                 },
                 {
                     "LEAN_APP_DIR": "leantime/"
diff --git a/LeanTime/template.json b/LeanTime/template.json
index 5084690..dcba132 100644
--- a/LeanTime/template.json
+++ b/LeanTime/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add LeanTime domain:",
-            "key": "LEANTIME_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },
diff --git a/filebrowser/domain-filebrowser.json b/filebrowser/domain-filebrowser.json
index 5cbda20..c758165 100644
--- a/filebrowser/domain-filebrowser.json
+++ b/filebrowser/domain-filebrowser.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "filebrowser",
-        "DOMAIN": "#FILEBROWSER_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "80"
                 },
                 {
-                    "DOMAIN": "#FILEBROWSER_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/filebrowser/service-filebrowser.json b/filebrowser/service-filebrowser.json
index 48329ed..d6a97fe 100644
--- a/filebrowser/service-filebrowser.json
+++ b/filebrowser/service-filebrowser.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "filebrowser",
-        "DOMAIN": "#FILEBROWSER_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/filebrowser/template.json b/filebrowser/template.json
index 6b02a85..90e38e3 100644
--- a/filebrowser/template.json
+++ b/filebrowser/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add your filebrowser domain:",
-            "key": "FILEBROWSER_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },
diff --git a/guacamole/domain-guacamole.json b/guacamole/domain-guacamole.json
index a271004..e2a2929 100644
--- a/guacamole/domain-guacamole.json
+++ b/guacamole/domain-guacamole.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "guacamole",
-        "DOMAIN": "#GUACAMOLE_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "8080/guacamole/"
                 },
                 {
-                    "DOMAIN": "#GUACAMOLE_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/guacamole/service-guacamole.json b/guacamole/service-guacamole.json
index bf3213e..054907b 100644
--- a/guacamole/service-guacamole.json
+++ b/guacamole/service-guacamole.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "guacamole",
-        "DOMAIN": "#GUACAMOLE_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/guacamole/template.json b/guacamole/template.json
index b8eb2c2..617da37 100644
--- a/guacamole/template.json
+++ b/guacamole/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add Guacamole domain:",
-            "key": "GUACAMOLE_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },
diff --git a/immich/domain-immich.json b/immich/domain-immich.json
index 4812f31..54ea8b4 100644
--- a/immich/domain-immich.json
+++ b/immich/domain-immich.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "immich",
-        "DOMAIN": "#IMMICH_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "2283"
                 },
                 {
-                    "DOMAIN": "#IMMICH_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/immich/service-immich.json b/immich/service-immich.json
index 27aeac8..8455556 100644
--- a/immich/service-immich.json
+++ b/immich/service-immich.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "immich",
-        "DOMAIN": "#IMMICH_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/immich/template.json b/immich/template.json
index 96e6528..c8efc36 100644
--- a/immich/template.json
+++ b/immich/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add Immich domain:",
-            "key": "IMMICH_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },
diff --git a/jellyfin/domain-jellyfin.json b/jellyfin/domain-jellyfin.json
index bf22b59..4bc563f 100644
--- a/jellyfin/domain-jellyfin.json
+++ b/jellyfin/domain-jellyfin.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "jellyfin",
-        "DOMAIN": "#JELLYFIN_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "8096"
                 },
                 {
-                    "DOMAIN": "#JELLYFIN_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/jellyfin/service-jellyfin.json b/jellyfin/service-jellyfin.json
index c09f5d0..1a8133c 100644
--- a/jellyfin/service-jellyfin.json
+++ b/jellyfin/service-jellyfin.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "jellyfin",
-        "DOMAIN": "#JELLYFIN_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/jellyfin/template.json b/jellyfin/template.json
index b2a3cf1..7a2b438 100644
--- a/jellyfin/template.json
+++ b/jellyfin/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add your Jellyfin domain:",
-            "key": "JELLYFIN_DOMAIN",
+            "key": "DOMAIN",
             "value": ""
         }
     ]
diff --git a/leantime/domain-leantime.json b/leantime/domain-leantime.json
index 869b936..95b5d59 100644
--- a/leantime/domain-leantime.json
+++ b/leantime/domain-leantime.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "leantime",
-        "DOMAIN": "#LEANTIME_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -32,7 +32,7 @@
                     "LOCATION": "#LEANTIME_LOCATION_PATH"
                 },
                 {
-                    "DOMAIN": "#LEANTIME_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/leantime/service-leantime.json b/leantime/service-leantime.json
index 6709c33..23dec3e 100644
--- a/leantime/service-leantime.json
+++ b/leantime/service-leantime.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "leantime",
-        "DOMAIN": "#LEANTIME_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -150,7 +150,7 @@
                     "LEAN_PORT": "80"
                 },
                 {
-                    "LEAN_APP_URL": "https://#LEANTIME_DOMAIN"
+                    "LEAN_APP_URL": "https://#DOMAIN"
                 },
                 {
                     "LEAN_APP_DIR": "leantime/"
diff --git a/leantime/template.json b/leantime/template.json
index 5084690..dcba132 100644
--- a/leantime/template.json
+++ b/leantime/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add LeanTime domain:",
-            "key": "LEANTIME_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },
diff --git a/outline/domain-outline.json b/outline/domain-outline.json
index 4a63ac3..d3e7684 100644
--- a/outline/domain-outline.json
+++ b/outline/domain-outline.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "outline",
-        "DOMAIN": "#OUTLINE_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/outline/service-outline.json b/outline/service-outline.json
index d2135c2..6701e20 100644
--- a/outline/service-outline.json
+++ b/outline/service-outline.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "outline",
-        "DOMAIN": "#OUTLINE_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/outline/template.json b/outline/template.json
index d945240..2d3884f 100644
--- a/outline/template.json
+++ b/outline/template.json
@@ -45,7 +45,7 @@
         },
         {
             "description": "Please add Outline domain:",
-            "key": "OUTLINE_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         }
diff --git a/transmission/domain-transmission.json b/transmission/domain-transmission.json
index 0c2def1..9084de0 100644
--- a/transmission/domain-transmission.json
+++ b/transmission/domain-transmission.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "transmission",
-        "DOMAIN": "#TRANSMISSION_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "9091"
                 },
                 {
-                    "DOMAIN": "#TRANSMISSION_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/transmission/service-transmission.json b/transmission/service-transmission.json
index 50bcede..13dcdec 100644
--- a/transmission/service-transmission.json
+++ b/transmission/service-transmission.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "transmission",
-        "DOMAIN": "#TRANSMISSION_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/transmission/template.json b/transmission/template.json
index c65d16b..8bc1060 100644
--- a/transmission/template.json
+++ b/transmission/template.json
@@ -3,7 +3,7 @@
     "fields": [
         {
             "description": "Please add your transmission domain:",
-            "key": "TRANSMISSION_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },
diff --git a/vaultwarden/domain-vaultwarden.json b/vaultwarden/domain-vaultwarden.json
index f266813..0393316 100644
--- a/vaultwarden/domain-vaultwarden.json
+++ b/vaultwarden/domain-vaultwarden.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "vaultwarden",
-        "DOMAIN": "#VAULTWARDEN_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "80"
                 },
                 {
-                    "DOMAIN": "#VAULTWARDEN_DOMAIN"
+                    "DOMAIN": "#DOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/vaultwarden/service-vaultwarden.json b/vaultwarden/service-vaultwarden.json
index fa2fcce..eaef5d0 100644
--- a/vaultwarden/service-vaultwarden.json
+++ b/vaultwarden/service-vaultwarden.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "vaultwarden",
-        "DOMAIN": "#VAULTWARDEN_DOMAIN"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/vaultwarden/template.json b/vaultwarden/template.json
index 2e53f88..c958349 100644
--- a/vaultwarden/template.json
+++ b/vaultwarden/template.json
@@ -37,7 +37,7 @@
         },
         {
             "description": "Please add VaultWarden domain:",
-            "key": "VAULTWARDEN_DOMAIN",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },