diff --git a/roles/openshift-apps/noggin/templates/noggin.cfg.py b/roles/openshift-apps/noggin/templates/noggin.cfg.py
index 1f58d2dd25..00b877f986 100644
--- a/roles/openshift-apps/noggin/templates/noggin.cfg.py
+++ b/roles/openshift-apps/noggin/templates/noggin.cfg.py
@@ -22,10 +22,7 @@ PASSWORD_RESET_EXPIRATION = 10
 # Email
 MAIL_FROM = "Fedora Account System <fas@fedoraproject.org>"
 MAIL_DEFAULT_SENDER = "Fedora Account System <fas@fedoraproject.org>"
-MAIL_SERVER = "smtp.sendgrid.net"
-MAIL_PORT = 587
-MAIL_USE_TLS = True
-MAIL_USERNAME = "apikey"
+MAIL_SERVER = "bastion.fedoraproject.org"
 
 # Theme
 THEME = "fas"
@@ -34,4 +31,3 @@ THEME = "fas"
 FREEIPA_ADMIN_PASSWORD = from_file('/etc/noggin-secrets/ipa-admin')
 FERNET_SECRET = from_file('/etc/noggin-secrets/fernet').encode('utf-8')
 SECRET_KEY = from_file('/etc/noggin-secrets/session').encode('utf-8')
-#MAIL_PASSWORD = from_file('/etc/noggin-secrets/smtp')