diff --git a/docker-compose.yml b/docker-compose.yml
index b3915bb..4c2f192 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - -c
       - |
         if [ ! -f /certs/cert.pem ]; then
-          openssl req -x509 -nodes -days 3650 -newkey rsa:4096 -keyout /certs/key.pem -out /certs/cert.pem -subj "/CN=mail.byte.trail" -addext "subjectAltName=DNS:mail.byte.trail,DNS:byte.trail"
+          openssl req -x509 -nodes -days 3650 -newkey rsa:4096 -keyout /certs/key.pem -out /certs/cert.pem -subj "/CN=mail.bytetrail.at" -addext "subjectAltName=DNS:mail.bytetrail.at,DNS:bytetrail.local"
           echo "[+] Zertifikat erstellt"
         else
           echo "[i] Zertifikat existiert bereits"
@@ -23,7 +23,7 @@ services:
       ssl-init:
         condition: service_completed_successfully
     # Provide the FQDN of your mail server here (Your DNS MX record should point to this value)
-    hostname: mail.byte.trail
+    hostname: mail.bytetrail.at
     env_file: mailserver.env
     # More information about the mail-server ports:
     # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/
diff --git a/mailserver.env b/mailserver.env
index d1d64e8..5663d0a 100644
--- a/mailserver.env
+++ b/mailserver.env
@@ -44,7 +44,7 @@ ACCOUNT_PROVISIONER=LDAP
 
 # empty => postmaster@domain.com
 # => Specify the postmaster address
-POSTMASTER_ADDRESS=postmaster@byte.trail
+POSTMASTER_ADDRESS=postmaster@bytetrail.at
 
 # Check for updates on container start and then once a day
 # If an update is available, a mail is sent to POSTMASTER_ADDRESS
@@ -464,11 +464,11 @@ LDAP_SERVER_HOST=ldaps://10.10.10.10
 
 # empty => ou=people,dc=domain,dc=com
 # => e.g. LDAP_SEARCH_BASE=dc=mydomain,dc=local
-LDAP_SEARCH_BASE=DC=byte,DC=trail
+LDAP_SEARCH_BASE=DC=bytetrail,DC=local
 
 # empty => cn=admin,dc=domain,dc=com
 # => take a look at examples of SASL_LDAP_BIND_DN
-LDAP_BIND_DN=CN=Mailserver Service Account,OU=Server,DC=byte,DC=trail
+LDAP_BIND_DN=CN=Mailserver Service Account,OU=Server,DC=bytetrail,DC=local
 
 # empty** => admin
 # => Specify the password to bind against ldap