diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 73734f9d9e..77cd7fd301 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -258,8 +258,8 @@ fedmenu.data_url = https://apps.fedoraproject.org/js/data.js
 
 # Koji Krb stuff
 krb_ccache = /tmp/krb5cc_%{uid}
-krb_principal = bodhi/bodhi.fedoraproject.org@FEDORAPROJECT.ORG
-krb_keytab = /etc/krb5.bodhi_bodhi.fedoraproject.org.keytab
+krb_principal = bodhi/bodhi{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }}
+krb_keytab = /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab
 
 ##
 ## ACL system