diff --git a/roles/base/files/postfix/bysender b/roles/base/files/postfix/bysender
index 54ee067dd9..7b88a0ef93 100644
--- a/roles/base/files/postfix/bysender
+++ b/roles/base/files/postfix/bysender
@@ -1 +1 @@
-@redhat.com [mx1.redhat.com]
+@redhat.com [smtp.corp.redhat.com]
diff --git a/roles/base/files/postfix/main.cf/main.cf.gateway b/roles/base/files/postfix/main.cf/main.cf.gateway
index f7e4c77c91..f782ee2b6d 100644
--- a/roles/base/files/postfix/main.cf/main.cf.gateway
+++ b/roles/base/files/postfix/main.cf/main.cf.gateway
@@ -744,7 +744,7 @@ smtp_tls_CAfile  =   /etc/pki/tls/certs/ca-bundle.crt
 smtp_tls_chain_files = /etc/pki/tls/private/gateway-chain.pem
 smtp_tls_security_level = may
 smtp_tls_connection_reuse = no
-smtp_connection_cache_destinations = mx1.redhat.com,gmail.com,google.com,scrye.com,redhat.com
+smtp_connection_cache_destinations = smtp.corp.redhat.com,gmail.com,google.com,scrye.com,redhat.com
 smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
 smtp_tls_session_cache_timeout = 3600s
 smtp_tls_policy_maps = hash:/etc/postfix/tls_policy                                                 
diff --git a/roles/base/files/postfix/tls_policy b/roles/base/files/postfix/tls_policy
index ff5307ed37..36257d2e1e 100644
--- a/roles/base/files/postfix/tls_policy
+++ b/roles/base/files/postfix/tls_policy
@@ -1 +1 @@
-[mx1.redhat.com]  none
+[smtp.corp.redhat.com]  none
diff --git a/roles/base/files/postfix/transports.gateway b/roles/base/files/postfix/transports.gateway
index a1eea484a8..4c7d524340 100644
--- a/roles/base/files/postfix/transports.gateway
+++ b/roles/base/files/postfix/transports.gateway
@@ -299,9 +299,9 @@
 #                                                                   TRANSPORT(5)
 
 fedora.redhat.com :
-redhat.com smtp:[mx1.redhat.com]
-.redhat.com smtp:[mx1.redhat.com]
-ceylon-lang.org smtp:[mx1.redhat.com]
+redhat.com smtp:[smtp.corp.redhat.com]
+.redhat.com smtp:[smtp.corp.redhat.com]
+ceylon-lang.org smtp:[smtp.corp.redhat.com]
 lists.stg.fedoraproject.org  smtp:[mailman01.stg.iad2.fedoraproject.org]
 lists.stg.fedorahosted.org   smtp:[mailman01.stg.iad2.fedoraproject.org]
 lists.stg.pagure.io          smtp:[mailman01.stg.iad2.fedoraproject.org]
diff --git a/roles/opendkim/files/opendkim.conf b/roles/opendkim/files/opendkim.conf
index 03315f72b2..7f8c51f22a 100644
--- a/roles/opendkim/files/opendkim.conf
+++ b/roles/opendkim/files/opendkim.conf
@@ -118,7 +118,7 @@ InternalHosts	refile:/etc/opendkim/TrustedHosts
 ##  whose mail should be neither signed nor verified by this filter.  See man
 ##  page for file format.
 # PeerList	X.X.X.X
-PeerList	mx1.redhat.com
+PeerList	smtp.corp.redhat.com
 
 ##  Always oversign From (sign using actual From and a null From to prevent
 ##  malicious signatures header fields (From and/or others) between the signer