diff --git a/core/admin/mailu/configuration.py b/core/admin/mailu/configuration.py
index 2e0ed489..f7040788 100644
--- a/core/admin/mailu/configuration.py
+++ b/core/admin/mailu/configuration.py
@@ -55,12 +55,16 @@ DEFAULT_CONFIG = {
     'LOG_LEVEL': 'WARNING',
     # Host settings
     'HOST_IMAP': 'imap',
+    'HOST_LMTP': 'imap:2525',
     'HOST_POP3': 'imap',
     'HOST_SMTP': 'smtp',
+    'HOST_AUTHSMTP': 'smtp',
+    'HOST_ADMIN': 'admin',
+    'HOST_ANTISPAM': 'antispam:11334',
     'HOST_WEBMAIL': 'webmail',
-    'HOST_FRONT': 'front',
+    'HOST_WEBDAV': 'webdav:5232',
     'HOST_REDIS': 'redis',
-    'HOST_AUTHSMTP': os.environ.get('HOST_SMTP', 'smtp'),
+    'HOST_FRONT': 'front',
     'SUBNET': '192.168.203.0/24',
     'POD_ADDRESS_RANGE': None
 }
diff --git a/core/dovecot/start.py b/core/dovecot/start.py
index e25d9c5d..4816cf9d 100755
--- a/core/dovecot/start.py
+++ b/core/dovecot/start.py
@@ -21,11 +21,11 @@ def start_podop():
     ])
 
 # Actual startup script
-os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
+os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
 os.environ["REDIS_ADDRESS"] = resolve(os.environ.get("HOST_REDIS", "redis"))
-os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin"))
+os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin"))
 if os.environ["WEBMAIL"] != "none":
-    os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("WEBMAIL_ADDRESS", "webmail"))
+    os.environ["WEBMAIL_ADDRESS"] = resolve(os.environ.get("HOST_WEBMAIL", "webmail"))
 
 for dovecot_file in glob.glob("/conf/*.conf"):
     convert(dovecot_file, os.path.join("/etc/dovecot", os.path.basename(dovecot_file)))
diff --git a/core/postfix/start.py b/core/postfix/start.py
index 95c97fde..716b3edb 100755
--- a/core/postfix/start.py
+++ b/core/postfix/start.py
@@ -26,8 +26,8 @@ def start_podop():
     ])
 
 # Actual startup script
-os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
-os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("ADMIN_ADDRESS", "admin"))
+os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
+os.environ["ADMIN_ADDRESS"] = resolve(os.environ.get("HOST_ADMIN", "admin"))
 os.environ["HOST_ANTISPAM"] = resolve(os.environ.get("HOST_ANTISPAM", "antispam:11332"))
 os.environ["HOST_LMTP"] = resolve(os.environ.get("HOST_LMTP", "imap:2525"))
 
diff --git a/services/rspamd/start.py b/services/rspamd/start.py
index c98f90f8..78e2f37d 100755
--- a/services/rspamd/start.py
+++ b/services/rspamd/start.py
@@ -9,7 +9,7 @@ from mailustart import resolve, convert
 log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
 
 # Actual startup script
-os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
+os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
 os.environ["HOST_REDIS"] = resolve(os.environ.get("HOST_REDIS", "redis"))
 
 for rspamd_file in glob.glob("/conf/*"):
diff --git a/webmails/rainloop/start.py b/webmails/rainloop/start.py
index 495eb376..f0b18dbd 100755
--- a/webmails/rainloop/start.py
+++ b/webmails/rainloop/start.py
@@ -9,8 +9,8 @@ from mailustart import resolve, convert
 log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
 
 # Actual startup script
-os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("FRONT_ADDRESS", "front"))
-os.environ["IMAP_ADDRESS"] = resolve(os.environ.get("IMAP_ADDRESS", "imap"))
+os.environ["FRONT_ADDRESS"] = resolve(os.environ.get("HOST_FRONT", "front"))
+os.environ["IMAP_ADDRESS"] = resolve(os.environ.get("HOST_IMAP", "imap"))
 
 os.environ["MAX_FILESIZE"] = str(int(int(os.environ.get("MESSAGE_SIZE_LIMIT"))*0.66/1048576))