diff --git a/docker-mailserver/mailserver.env b/docker-mailserver/mailserver.env
index c3d37fd..d0b40b9 100644
--- a/docker-mailserver/mailserver.env
+++ b/docker-mailserver/mailserver.env
@@ -4,10 +4,9 @@
 
 # empty => uses the `hostname` command to get the mail server's canonical hostname
 # => Specify a fully-qualified domainname to serve mail for.  This is used for many of the config features so if you can't set your hostname (e.g. you're in a container platform that doesn't let you) specify it in this environment variable.
-OVERRIDE_HOSTNAME=
+OVERRIDE_HOSTNAME=mail.zweili.org
 
-# 0 => Debug disabled
-# 1 => Enables debug on startup
+# 0 => Debug disabled 1 => Enables debug on startup
 DMS_DEBUG=0
 
 # critical => Only show critical messages
@@ -23,7 +22,7 @@ ONE_DIR=0
 
 # empty => postmaster@domain.com
 # => Specify the postmaster address
-POSTMASTER_ADDRESS=
+POSTMASTER_ADDRESS=postmaster@2li.ch
 
 # Set different options for mynetworks option (can be overwrite in postfix-main.cf)
 # **WARNING**: Adding the docker network's gateway to the list of trusted hosts, e.g. using the `network` or
@@ -198,7 +197,7 @@ POSTFIX_INET_PROTOCOLS=all
 # ––– Spamassassin Section ––––––––––––––––––––––
 # –––––––––––––––––––––––––––––––––––––––––––––––
 
-ENABLE_SPAMASSASSIN=0
+ENABLE_SPAMASSASSIN=1
 
 # deliver spam messages in the inbox (eventually tagged using SA_SPAM_SUBJECT)
 SPAMASSASSIN_SPAM_TO_INBOX=1
@@ -425,7 +424,7 @@ SRS_SECRET=
 #
 # empty => don't configure default relay host
 # default host and optional port to relay all mail through
-DEFAULT_RELAY_HOST=
+DEFAULT_RELAY_HOST=mail.infomaniak.com
 
 # –––––––––––––––––––––––––––––––––––––––––––––––
 # ––– Multi-Domain Relay Section ––––––––––––––––
@@ -436,11 +435,11 @@ DEFAULT_RELAY_HOST=
 #
 # empty => don't configure relay host
 # default host to relay mail through
-RELAY_HOST=
+RELAY_HOST=mail.infomaniak.com
 
 # empty => 25
 # default port to relay mail
-RELAY_PORT=25
+RELAY_PORT=587
 
 # empty => no default
 # default relay username (if no specific entry exists in postfix-sasl-password.cf)
@@ -448,4 +447,4 @@ RELAY_USER=
 
 # empty => no default
 # password for default relay user
-RELAY_PASSWORD=
\ No newline at end of file
+RELAY_PASSWORD=