diff --git a/roles/bodhi2/backend/templates/tag2distrepo.py.j2 b/roles/bodhi2/backend/templates/tag2distrepo.py.j2
index c9931c1a4f..2c9a56538b 100644
--- a/roles/bodhi2/backend/templates/tag2distrepo.py.j2
+++ b/roles/bodhi2/backend/templates/tag2distrepo.py.j2
@@ -7,10 +7,10 @@ config = {
 
     'tag2distrepo.tags': {
         'primary': {
-            'url': 'https://koji.fedoraproject.org/kojihub',
+            'url': 'https://koji{{ env_suffix }}.fedoraproject.org/kojihub',
             'authmethod': 'kerberos',
-            'principal': 'bodhi/bodhi.fedoraproject.org@FEDORAPROJECT.ORG',
-            'keytab': '/etc/krb5.bodhi_bodhi.fedoraproject.org.keytab',
+            'principal': 'bodhi/bodhi{{ env_suffix }}.fedoraproject.org@{{ ipa_realm }}',
+            'keytab': '/etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab',
 	    'options': {
 	    	'krb_rdns': False
 	    },