diff --git a/roles/bodhi2/base/templates/fedora-messaging.toml.j2 b/roles/bodhi2/base/templates/fedora-messaging.toml.j2
index 9f6b83439b..86d2829d34 100644
--- a/roles/bodhi2/base/templates/fedora-messaging.toml.j2
+++ b/roles/bodhi2/base/templates/fedora-messaging.toml.j2
@@ -72,7 +72,7 @@ class = "logging.handlers.SMTPHandler"
 formatter = "simple"
 level = "ERROR"
 filters = ["rate_limit"]
-mailhost = "bastion"
+mailhost = "bastion.fedoraproject.org"
 {% if env == "staging" %}
 fromaddr = "updates@stg.fedoraproject.org"
 {% else %}
diff --git a/roles/bodhi2/base/templates/logging.yaml.j2 b/roles/bodhi2/base/templates/logging.yaml.j2
index 6576572d8b..78946a29ca 100644
--- a/roles/bodhi2/base/templates/logging.yaml.j2
+++ b/roles/bodhi2/base/templates/logging.yaml.j2
@@ -22,7 +22,7 @@ handlers:
     level: ERROR
     formatter: generic
     filters: [rate_limit]
-    mailhost: "bastion"
+    mailhost: "bastion.fedoraproject.org"
 {% if env == "production" %}
     fromaddr: "updates@fedoraproject.org"
 {% else %}
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 25566d56dd..9a5fdca581 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -298,7 +298,7 @@ fedora_40_primary_arches = aarch64 x86_64
 # The hostname of an SMTP server Bodhi can use to deliver e-mail.
 # smtp_server =
 {% if env == "production" %}
-smtp_server = bastion
+smtp_server = bastion.fedoraproject.org
 {% endif %}
 
 # The updates system itself. This e-mail address is used as the From address for e-mails that Bodhi
@@ -821,7 +821,7 @@ formatter = generic
 
 [handler_smtp]
 class = logging.handlers.SMTPHandler
-kwargs = {'mailhost':'bastion', 'fromaddr':'updates@stg.fedoraproject.org', 'toaddrs':['bodhiadmin-members@fedoraproject.org'], 'subject':'Bodhi error'}
+kwargs = {'mailhost':'bastion.fedoraproject.org', 'fromaddr':'updates@stg.fedoraproject.org', 'toaddrs':['bodhiadmin-members@fedoraproject.org'], 'subject':'Bodhi error'}
 level = ERROR
 formatter = generic