diff --git a/.env.sample b/.env.sample
index f34a513..69950b5 100644
--- a/.env.sample
+++ b/.env.sample
@@ -3,6 +3,6 @@ TYPE=element-web
 DOMAIN=element-web.example.com
 LETS_ENCRYPT_ENV=production
 
-DOMAIN=matrix.example.com
+HOMESERVER=matrix.example.com
 SERVER_NAME=mymatrix
 BRAND=mymatrix
diff --git a/config.json.tmpl b/config.json.tmpl
index 7e0fa50..a89f649 100644
--- a/config.json.tmpl
+++ b/config.json.tmpl
@@ -1,7 +1,7 @@
 {
     "default_server_config": {
         "m.homeserver": {
-            "base_url": "https://{{ env "DOMAIN" }}",
+            "base_url": "https://{{ env "HOMESERVER" }}",
             "server_name": "{{ env "SERVER_NAME" }}"
         },
         "m.identity_server": {
@@ -35,7 +35,7 @@
     "default_theme": "light",
     "roomDirectory": {
         "servers": [
-            "{{ env "DOMAIN" }}"
+            "{{ env "HOMESERVER" }}"
         ]
     },
     "piwik": false,