diff --git a/matrix/domain-matrix-admin.json b/matrix/domain-matrix-admin.json
index 82539c0..592fe85 100644
--- a/matrix/domain-matrix-admin.json
+++ b/matrix/domain-matrix-admin.json
@@ -1,7 +1,7 @@
 {
     "main": {
         "SERVICE_NAME": "matrix",
-        "DOMAIN": "#DOMAIN_ADMIN"
+        "DOMAIN": "#ADMINDOMAIN"
     },
     "containers": [
         {
@@ -29,7 +29,7 @@
                     "PORT": "80"
                 },
                 {
-                    "DOMAIN": "#DOMAINADMIN"
+                    "DOMAIN": "#ADMINDOMAIN"
                 },
                 {
                     "SMARTHOST_PROXY_PATH": "/smarthost-domains"
diff --git a/matrix/matrix-secret.json b/matrix/matrix-secret.json
index afb2c53..66bca87 100644
--- a/matrix/matrix-secret.json
+++ b/matrix/matrix-secret.json
@@ -22,8 +22,8 @@
     },
     "matrixadmin": {
         "REACT_APP_SERVER": "https://#DOMAIN",
-        "BASE_PATH": "/synapse-admin",
-        "DOMAINADMIN": "#DOMAINADMIN",
+        "BASE_PATH": "#ADMINDOMAIN",
+        "ADMINDOMAIN": "#ADMINDOMAIN",
         "SUBPATH": "#SUBPATH"
     }
 }
\ No newline at end of file
diff --git a/matrix/template.json b/matrix/template.json
index ed03ab0..c2f44ad 100644
--- a/matrix/template.json
+++ b/matrix/template.json
@@ -26,14 +26,14 @@
         },
         {
             "description": "Add matrix server admin domain",
-            "key": "DOMAIN_ADMIN",
+            "key": "ADMINDOMAIN",
             "value": "",
             "required": "true"
         },
         {
             "description": "Add domain subpath for matrix admin (e.g. admin)",
             "details": "Optional - leave blank for none but keep in mind subpath will be required if you have other services using the same domain, for example matrix domain is the same as admin domain.",
-            "key": "SUB_PATH",
+            "key": "SUBPATH",
             "value": ""
         },
         {