diff --git a/defaults/main.yml b/defaults/main.yml
index e3d735de2d2aeb36784bd6b93c3f177a0f9d919f..9a20850879aa16a4bc01097200b79ba5ae58e7ca 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,36 @@
 ---
+# The name of this mail system, set in '/etc/mailname'
+postfix__mailname: '{{ ansible_fqdn }}'
+
+
+
+# Default variables for the main.cf template. These are always included.
+postfix__myorigin:
+postfix__smtpd_banner: '$myhostname ESMTP $mail_name ({{ ansible_distribution }})'
+postfix__biff: no
+postfix__append_dot_mydomain: no
+postfix__generate_delayed_mail_warnings: no
+postfix__delay_warning_time: 4h
+postfix__readme_directory: no
+postfix__smtpd_tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
+postfix__smtpd_tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
+postfix__smtpd_use_tls: yes
+postfix__smtpd_tls_session_cache_database: 'btree:${data_directory}/smtpd_scache'
+postfix__smtp_tls_session_cache_database: 'btree:${data_directory}/smtp_scache'
+postfix__smtpd_relay_restrictions: permit_mynetworks permit_sasl_authenticated defer_unauth_destination
+postfix__myhostname: '{{ ansible_hostname | d() }}'
+postfix__alias_maps: 'hash:/etc/aliases'
+postfix__alias_database: 'hash:/etc/aliases'
+postfix__mydestination: '$myhostname, localhost.localdomain, localhost'
+postfix__relayhost:
+postfix__mynetworks: '127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128'
+postfix__mailbox_size_limit: 0
+postfix__recipient_delimiter: '+'
+postfix__inet_interfaces: all
+postfix__inet_protocols: all
+
+
+
 # Transport map
 # <pattern> is an email address, domain name, or * to lookup the mail recipient
 # <result> specificies how and where to deliver mail and has the format
@@ -27,33 +59,5 @@
 # Valid <transport> and <nexthop> values are described in the postfix transport
 # documentation. http://www.postfix.org/transport.5.html
 postfix__transport_map: []
-
-# The name of this mail system, set in '/etc/mailname'
-postfix__mailname: '{{ ansible_fqdn }}'
-
-## Variables for the main.cf template, in top-down order
-postfix__myorigin:
-postfix__smtpd_banner: '$myhostname ESMTP $mail_name ({{ ansible_distribution }})'
-postfix__biff: no
-postfix__append_dot_mydomain: no
-postfix__generate_delayed_mail_warnings: no
-postfix__delay_warning_time: 4h
-postfix__readme_directory: no
-postfix__smtpd_tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
-postfix__smtpd_tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
-postfix__smtpd_use_tls: yes
-postfix__smtpd_tls_session_cache_database: 'btree:${data_directory}/smtpd_scache'
-postfix__smtp_tls_session_cache_database: 'btree:${data_directory}/smtp_scache'
-postfix__smtpd_relay_restrictions: 'permit_mynetworks permit_sasl_authenticated defer_unauth_destination'
-postfix__myhostname: '{{ ansible_hostname | d() }}'
-postfix__alias_maps: 'hash:/etc/aliases'
-postfix__alias_database: 'hash:/etc/aliases'
-postfix__mydestination: '$myhostname, localhost.localdomain, localhost'
-postfix__relayhost:
-postfix__mynetworks: '127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128'
-postfix__mailbox_size_limit: 0
-postfix__recipient_delimiter: '+'
-postfix__inet_interfaces: all
-postfix__inet_protocols: all
 ...
 # vi: set ts=2 sts=2 sw=2 et ft=yaml: