diff --git a/dovecot/defaults/main.yml b/dovecot/defaults/main.yml
index 2e094cc55266fee2bf1a0ab72fe2a7245e54ef98..69f0c0ae1953dfcf2c62d606d29fa4b9698c5dc3 100644
--- a/dovecot/defaults/main.yml
+++ b/dovecot/defaults/main.yml
@@ -16,16 +16,15 @@ dovecot_tls_key: /etc/ssl/private/privkey.pem
 dovecot_tls_ca_dir: /etc/ssl/certs
 dovecot_tls_ciphers: "{{ tls_ciphers }}"
 dovecot_tls_dh_length: 4096
-dovecot_tls_protocols: TLSv1.1 TLSv1.2 !SSLv3
+dovecot_tls_protocols: 'TLSv1.1 TLSv1.2 !SSLv3'
 
-dovecot_dsync: yes
+dovecot_dsync: no
 dovecot_dsync_tls: no
 dovecot_dsync_group: dovecot
 dovecot_dsync_address: '0.0.0.0'
 dovecot_dsync_password: "{{ lookup('passwordstore', dovecot_dsync_passwordstore ~ ' create=true length=20') }}"
-dovecot_dsync_passwordstore: selfhosted/dsync
+dovecot_dsync_passwordstore: dsync
 dovecot_dsync_host_attribute: ansible_host
 
-dovecot_content_filter: yes
+dovecot_content_filter: no
 dovecot_spam_folder: Spam
-
diff --git a/postfix/defaults/main.yml b/postfix/defaults/main.yml
index 9c10031cb3a9dd27db3c2f3664e0c15522d6a804..111ed787f4d13b8e02862d15b8bdac93bd546f51 100644
--- a/postfix/defaults/main.yml
+++ b/postfix/defaults/main.yml
@@ -7,9 +7,8 @@ postfix_virtual_domains: []
 postfix_tls_cert: /etc/ssl/private/fullchain.pem
 postfix_tls_key: /etc/ssl/private/privkey.pem
 postfix_tls_ciphers: "{{ tls_ciphers }}"
-postfix_tls_protocols: "!SSLv2 !SSLv3"
+postfix_tls_protocols: '!SSLv2 !SSLv3'
 
-postfix_login_suffix: '@extmind.de'
 postfix_prefer_lmtp: no
 postfix_enable_memcached: no
 postfix_login_suffix: ''