diff --git a/rootfs/etc/confd/templates/main.cf.tmpl b/rootfs/etc/confd/templates/main.cf.tmpl
index d7eb019..a375894 100644
--- a/rootfs/etc/confd/templates/main.cf.tmpl
+++ b/rootfs/etc/confd/templates/main.cf.tmpl
@@ -44,9 +44,6 @@ smtpd_tls_mandatory_exclude_ciphers = {{getenv "TLS_EXCLUDE_CIPHERS" "aNULL, MD5
 smtpd_tls_exclude_ciphers = {{getenv "TLS_EXCLUDE_CIPHERS" "aNULL, MD5, 3DES"}}
 smtpd_tls_wrappermode = no
 
-smtp_tls_mandatory_ciphers = $smtpd_tls_mandatory_ciphers
-smtp_tls_ciphers = $smtpd_tls_ciphers
-
 lmtp_tls_mandatory_ciphers = $smtpd_tls_mandatory_ciphers
 lmtp_tls_ciphers = $smtpd_tls_ciphers
 
diff --git a/rootfs/etc/confd/templates/master.cf.tmpl b/rootfs/etc/confd/templates/master.cf.tmpl
index b62d9ac..6e7b117 100644
--- a/rootfs/etc/confd/templates/master.cf.tmpl
+++ b/rootfs/etc/confd/templates/master.cf.tmpl
@@ -1,5 +1,5 @@
 submission  inet  n  - - - -  smtpd
-  -o syslog_name=postfix/submission
+  -o tls_preempt_cipherlist=yes
   -o smtpd_tls_security_level=encrypt
 
 smtp      inet  n       -       n       -       -       smtpd