diff --git a/roles/mail_server/templates/main.cf.j2 b/roles/mail_server/templates/main.cf.j2
index 7f83177c2c3f4d9e96e149f7695c775469a05d9c..af436cf335f845434d05b532faedb0be6b66f55b 100644
--- a/roles/mail_server/templates/main.cf.j2
+++ b/roles/mail_server/templates/main.cf.j2
@@ -23,10 +23,6 @@ inet_protocols = all
 # fails. Useful for local overrides of mail servers.
 smtp_host_lookup = dns, native
 
-# Do not append server's domain to locally sent mail. This is up to
-# sending MUAs to take care of.
-append_dot_mydomain = no
-
 # Recipient delimeter for separating user name from its extension.
 recipient_delimiter = +
 
@@ -40,9 +36,15 @@ message_size_limit = {{ mail_message_size_limit }}
 # Disable output of Postfix README file paths when invoking postconf.
 readme_directory = no
 
+{% if ansible_distribution_release != 'bullseye' %}
+# Use whitelist/blacklist instead of allowlist/denylist in log
+# entries.
+respectful_logging = no
+{% endif %}
+
 # Compatibility level for default values. For more details, see:
 #     https://www.postfix.org/COMPATIBILITY_README.html
-compatibility_level = 2
+compatibility_level = 3.6
 
 
 # Local mailbox delivery