diff --git a/bundles/postfix/files/main.cf b/bundles/postfix/files/main.cf
index fb307a0..48bcaae 100644
--- a/bundles/postfix/files/main.cf
+++ b/bundles/postfix/files/main.cf
@@ -9,7 +9,7 @@ smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 </%text>
 smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-myhostname = debian-2gb-nbg1-1
+myhostname = ${hostname}
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
diff --git a/bundles/postfix/items.py b/bundles/postfix/items.py
index 8e07cfc..cede88a 100644
--- a/bundles/postfix/items.py
+++ b/bundles/postfix/items.py
@@ -15,6 +15,9 @@ file_options = {
 files = {
     '/etc/postfix/main.cf': {
         'content_type': 'mako',
+        'context': {
+            'hostname': node.metadata.get('mailserver/hostname'),
+        },
         **file_options,
     },
     '/etc/postfix/master.cf': {
diff --git a/bundles/roundcube/files/config.inc.php b/bundles/roundcube/files/config.inc.php
index bcaef07..f501634 100644
--- a/bundles/roundcube/files/config.inc.php
+++ b/bundles/roundcube/files/config.inc.php
@@ -46,7 +46,7 @@ $config['default_host'] = 'localhost';
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %z - IMAP domain (IMAP hostname without the first part)
 // For example %n = mail.domain.tld, %t = domain.tld
-$config['smtp_server'] = '';
+$config['smtp_server'] = 'tls://localhost';
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 52bad12..bc81465 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -35,14 +35,17 @@
             'ckn.li': {
                 'A': ['162.55.188.157'],
                 'AAAA': ['2a01:4f8:1c1c:4121::2'],
-            }
+            },
+            'freibrief.net': {
+                'A': ['162.55.188.157'],
+                'AAAA': ['2a01:4f8:1c1c:4121::2'],
+            },
         },
         'letsencrypt': {
             'domains': {
                 'ckn.li': {},
                 'sublimity.de': {},
                 'freibrief.net': {},
-                'naeder.net': {},
             },
         },
         'network': {