diff --git a/roles/hosts/files/qa.fedoraproject.org-hosts b/roles/hosts/files/qa.fedoraproject.org-hosts
index ba5fbfb525..28d90234ff 100644
--- a/roles/hosts/files/qa.fedoraproject.org-hosts
+++ b/roles/hosts/files/qa.fedoraproject.org-hosts
@@ -16,3 +16,6 @@
 
 # these are needed for the beaker-project repos
 74.207.232.43  beaker-project.org
+
+# alias bastion.fedoraproject.org to the internal IP so that ssl doesn't puke
+10.5.126.12    bastion.fedoraproject.org bastion
diff --git a/roles/phabricator/templates/local.json.j2 b/roles/phabricator/templates/local.json.j2
index 236969b775..4462e6a9a4 100644
--- a/roles/phabricator/templates/local.json.j2
+++ b/roles/phabricator/templates/local.json.j2
@@ -22,7 +22,7 @@
   "metamta.domain" : "{{ phabricator_mail_domain }}",
   "metamta.reply-handler-domain" : "{{ phabricator_mail_domain }}",
   "metamta.mail-adapter" : "{{ "PhabricatorMailImplementationPHPMailerAdapter" if phabricator_mail_enabled else "PhabricatorMailImplementationTestAdapter"}}",
-  "phpmailer.smtp-host" : "bastion.phx2.fedoraproject.org",
+  "phpmailer.smtp-host" : "bastion.fedoraproject.org",
   "phpmailer.smtp-protocol" : "",
   "phabricator.uninstalled-applications" : {
         "PhabricatorApplicationPhame" : true,