diff --git a/.env.dist b/.env.dist
index 1c46082a..17bfaaad 100644
--- a/.env.dist
+++ b/.env.dist
@@ -23,9 +23,7 @@ BIND_ADDRESS=127.0.0.1
 # Main mail domain
 DOMAIN=mailu.io
 
-# Main hostname for announces, and list of all available hostnames, separated
-# by comas
-HOSTNAME=mail.mailu.io
+# Hostnames for this server, separated with comas
 HOSTNAMES=mail.mailu.io,alternative.mailu.io,yetanother.mailu.io
 
 # Postmaster local part (will append the main mail domain)
diff --git a/admin/mailu/ui/templates/domain/details.html b/admin/mailu/ui/templates/domain/details.html
index 1ae45e16..5b3655de 100644
--- a/admin/mailu/ui/templates/domain/details.html
+++ b/admin/mailu/ui/templates/domain/details.html
@@ -15,6 +15,7 @@
 {% endblock %}
 
 {% block box %}
+{% let hostname = config["HOSTNAMES"].split(",")[0] %}
 <table class="table table-bordered">
   <tbody>
     <tr>
@@ -28,8 +29,8 @@
     <tr>
       <th>{% trans %}DNS SPF entries{% endtrans %}</th>
       <td><pre>
-{{ domain.name }}. 600 IN TXT "v=spf1 mx a:{{ config["HOSTNAME"] }} -all"
-{{ domain.name }}. 600 IN SPF "v=spf1 mx a:{{ config["HOSTNAME"] }} -all"</pre></td>
+{{ domain.name }}. 600 IN TXT "v=spf1 mx a:{{ hostname }} -all"
+{{ domain.name }}. 600 IN SPF "v=spf1 mx a:{{ hostname }} -all"</pre></td>
     </tr>
     {% if domain.dkim_publickey %}
     <tr>
diff --git a/dovecot/conf/dovecot.conf b/dovecot/conf/dovecot.conf
index a1ec72fd..98cff4bc 100644
--- a/dovecot/conf/dovecot.conf
+++ b/dovecot/conf/dovecot.conf
@@ -4,7 +4,7 @@
 log_path = /dev/stderr
 protocols = imap pop3 lmtp sieve
 postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }}
-hostname = {{ HOSTNAME }}
+hostname = {{ HOSTNAMES.split(",")[0] }}
 mail_plugins = $mail_plugins quota
 submission_host = smtp
 
diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index 04b67553..afe48813 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -4,7 +4,7 @@
 
 # Main domain and hostname
 mydomain = {{ DOMAIN }}
-myhostname = {{ HOSTNAME }}
+myhostname = {{ HOSTNAMES.split(",")[0] }}
 myorigin = $mydomain
 
 # Queue location