diff --git a/nextcloud/domain-nextcloud.json b/nextcloud/domain-nextcloud.json
index 6117507..86cb081 100644
--- a/nextcloud/domain-nextcloud.json
+++ b/nextcloud/domain-nextcloud.json
@@ -1,48 +1,60 @@
- {
-    "main": { 
-      "SERVICE_NAME": "nextcloud",
-      "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS"
+{
+    "main": {
+        "SERVICE_NAME": "nextcloud",
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
-      { 
-  "IMAGE": "safebox/domain-check",
-	"UPDATE": "true",
-  "MEMORY": "64M",
-	"NAME": "domain_checker", 
-	"ROLES": "domain_checker", 
-	"NETWORK": "host", 
-	"SELECTOR": "",
-	"SCALE": "0", 
-	"EXTRA": "--rm --privileged",
-	"PRE_START": [], 
-	"DEPEND": [], 
-	"POST_START": [], 
-	"CMD": "",
-        "ENVS": [
-          { "PROXY": "smarthostloadbalancer" },
-          { "TARGET": "nextcloudnginx" },
-          { "PORT": "80" },
-          { "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS" },
-          { "SMARTHOST_PROXY_PATH": "/smarthost-domains" },
-	        { "OPERATION": "CREATE" }
-        ],
-        "VOLUMES": [
-          {
-       	"SOURCE": "/etc/user/config/smarthost-domains",
-        "DEST": "/smarthost-domains",
-        "TYPE": "rw"
-          },
-	        {
-	      "SOURCE": "/etc/system/data/dns/hosts.local",
-	      "DEST": "/etc/dns/hosts.local",
-	      "TYPE": "ro"
-	        },
-          { 
-	      "SOURCE": "/var/run/docker.sock", 
-	      "DEST": "/var/run/docker.sock", 
-	      "TYPE": "rw" 
-          }
-	    ]
-    }
-  ]
-}
+        {
+            "IMAGE": "safebox/domain-check",
+            "UPDATE": "true",
+            "MEMORY": "64M",
+            "NAME": "domain_checker",
+            "ROLES": "domain_checker",
+            "NETWORK": "host",
+            "SELECTOR": "",
+            "SCALE": "0",
+            "EXTRA": "--rm --privileged",
+            "PRE_START": [],
+            "DEPEND": [],
+            "POST_START": [],
+            "CMD": "",
+            "ENVS": [
+                {
+                    "PROXY": "smarthostloadbalancer"
+                },
+                {
+                    "TARGET": "nextcloudnginx"
+                },
+                {
+                    "PORT": "80"
+                },
+                {
+                    "DOMAIN": "#DOMAIN"
+                },
+                {
+                    "SMARTHOST_PROXY_PATH": "/smarthost-domains"
+                },
+                {
+                    "OPERATION": "CREATE"
+                }
+            ],
+            "VOLUMES": [
+                {
+                    "SOURCE": "/etc/user/config/smarthost-domains",
+                    "DEST": "/smarthost-domains",
+                    "TYPE": "rw"
+                },
+                {
+                    "SOURCE": "/etc/system/data/dns/hosts.local",
+                    "DEST": "/etc/dns/hosts.local",
+                    "TYPE": "ro"
+                },
+                {
+                    "SOURCE": "/var/run/docker.sock",
+                    "DEST": "/var/run/docker.sock",
+                    "TYPE": "rw"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/nextcloud/nextcloud-secret.json b/nextcloud/nextcloud-secret.json
index 445b817..423ca90 100644
--- a/nextcloud/nextcloud-secret.json
+++ b/nextcloud/nextcloud-secret.json
@@ -8,8 +8,8 @@
     "nextcloudphp": {
         "NEXTCLOUD_ADMIN_USER": "#NEXTCLOUD_ADMIN_USER",
         "NEXTCLOUD_ADMIN_PASSWORD": "#NEXTCLOUD_ADMIN_PASSWORD",
-        "NEXTCLOUD_TRUSTED_DOMAINS": "#NEXTCLOUD_TRUSTED_DOMAINS",
-        "OVERWRITEHOST": "#NEXTCLOUD_TRUSTED_DOMAINS",
+        "DOMAIN": "#DOMAIN",
+        "OVERWRITEHOST": "#DOMAIN",
         "NEXTCLOUD_DATA_DIR": "/var/data",
         "POSTGRES_DB": "#POSTGRES_DB",
         "POSTGRES_USER": "#POSTGRES_USER",
diff --git a/nextcloud/service-nextcloud.json b/nextcloud/service-nextcloud.json
index 767095c..435a868 100644
--- a/nextcloud/service-nextcloud.json
+++ b/nextcloud/service-nextcloud.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "nextcloud",
-        "DOMAIN": "#NEXTCLOUD_TRUSTED_DOMAINS"
+        "DOMAIN": "#DOMAIN"
     },
     "containers": [
         {
diff --git a/nextcloud/template.json b/nextcloud/template.json
index cec170c..7511f52 100644
--- a/nextcloud/template.json
+++ b/nextcloud/template.json
@@ -10,7 +10,7 @@
             "details": "",
             "info": "Nextcloud domain info",
             "description": "Domain",
-            "key": "NEXTCLOUD_TRUSTED_DOMAINS",
+            "key": "DOMAIN",
             "value": "",
             "required": "true"
         },