diff --git a/roles/base/files/postfix/main.cf/main.cf.gateway b/roles/base/files/postfix/main.cf/main.cf.gateway
index cbb82ba021..7a941373e3 100644
--- a/roles/base/files/postfix/main.cf/main.cf.gateway
+++ b/roles/base/files/postfix/main.cf/main.cf.gateway
@@ -594,7 +594,7 @@ recipient_delimiter = +
 # eligible for this service. By default, they are all domains that
 # this server is willing to relay mail to.
 # 
-#fast_flush_domains = $relay_domains
+fast_flush_domains = $relay_domains,redhat.com,gmail.com,google.com
 
 # SHOW SOFTWARE VERSION OR NOT
 #
diff --git a/roles/base/files/postfix/master.cf/master.cf.gateway b/roles/base/files/postfix/master.cf/master.cf.gateway
index 32d395cbb3..55c4ccc125 100644
--- a/roles/base/files/postfix/master.cf/master.cf.gateway
+++ b/roles/base/files/postfix/master.cf/master.cf.gateway
@@ -6,7 +6,8 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
-smtp      inet  n       -       n       -       -       smtpd
+smtp       inet  n       -       n       -       40      smtpd
+tlsproxy   unix  -       -       n       -       -       tlsproxy
 #submission inet n       -       n       -       -       smtpd
 #  -o smtpd_enforce_tls=yes
 #  -o smtpd_sasl_auth_enable=yes
@@ -38,6 +39,7 @@ virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
 anvil     unix  -       -       n       -       1       anvil
 scache	  unix	-	-	n	-	1	scache
+postlog   unix-dgram n  -       n       -       1       postlogd
 #
 # ====================================================================
 # Interfaces to non-Postfix software. Be sure to examine the manual
diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml
index a5f7524baf..63708ba49a 100644
--- a/roles/base/tasks/postfix.yml
+++ b/roles/base/tasks/postfix.yml
@@ -22,7 +22,7 @@
     - "postfix/master.cf/master.cf.{{ host_group }}"
     - "postfix/master.cf/master.cf.{{ postfix_group }}"
     - "postfix/master.cf/master.cf"
-  when: inventory_hostname.startswith(('smtp-mm', 'mailman', 'noc02'))
+  when: inventory_hostname.startswith(('smtp-mm', 'mailman', 'noc02', 'bastion'))
   notify:
   - restart postfix
   tags: