diff --git a/roles/base/templates/krb5.conf.j2 b/roles/base/templates/krb5.conf.j2
index f9aef65e25..2373955fa4 100644
--- a/roles/base/templates/krb5.conf.j2
+++ b/roles/base/templates/krb5.conf.j2
@@ -17,12 +17,8 @@ includedir /etc/krb5.conf.d/
 
 [realms]
  {{ ipa_realm }} = {
-{% if ansible_distribution_major_version|default(0)|int == 6 and ansible_distribution == "RedHat" %}
-  kdc = {{ ipa_server }}
-{% else %}
   kdc = https://id{{ env_suffix }}.fedoraproject.org/KdcProxy
-{% endif %}
-{% if (ansible_hostname|default('')).startswith('koji') %}
+{% if (ansible_hostname|default('')).startswith(('koji','riscv-koji')) %}
   # This maps "A/B@FP.O" to "A/B@FP.O", and is used for gss localname in koji gssapi
   auth_to_local = RULE:[2:$1/$2@$0](.*)
   auth_to_local = DEFAULT