diff --git a/postfix/tasks/main.yml b/postfix/tasks/main.yml
index 872df6c5a1455c79b7601eeca327e4f4911213b5..0522055b66de37758e2fb3b87413e01cbca74822 100644
--- a/postfix/tasks/main.yml
+++ b/postfix/tasks/main.yml
@@ -127,7 +127,7 @@
     dest: /etc/postfix/transport
   notify:
     - postmap transport
-  when: postfix_transport_maps|bool
+  when: postfix_transport_maps|count > 0
   tags:
     - postfix
     - mail
diff --git a/postfix/templates/main.cf.j2 b/postfix/templates/main.cf.j2
index 4478017b1c6da84689698e492deb63fd093a9092..a56e2e4e45778fec7ecc6cf13a5ce87b8becf1c5 100644
--- a/postfix/templates/main.cf.j2
+++ b/postfix/templates/main.cf.j2
@@ -7,7 +7,7 @@ myorigin = /etc/mailname
 mydestination = $myhostname localhost {{ postfix_domains | join(" ") }}
 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {{ postfix_my_networks|join(" ") }}
 relayhost = {{ postfix_relay_host }}
-{% if postfix_transport_maps|bool %}
+{% if postfix_transport_maps|count > 0 %}
 transport_maps = cdb:/etc/postfix/transport
 {% endif %}
 
@@ -59,7 +59,6 @@ recipient_canonical_maps = tcp:127.0.0.1:10002
 recipient_canonical_classes= envelope_recipient,header_recipient
 {% endif %}
 
-smtpd_use_tls = yes
 smtp_tls_security_level = may
 smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
 smtpd_tls_security_level = may