diff --git a/roles/base/templates/krb5.conf.master.j2 b/roles/base/templates/krb5.conf.master.j2
index fe0f84ee45..65f022748e 100644
--- a/roles/base/templates/krb5.conf.master.j2
+++ b/roles/base/templates/krb5.conf.master.j2
@@ -12,12 +12,14 @@ includedir /var/lib/sss/pubconf/krb5.include.d/
  default_realm = STG.FEDORAPROJECT.ORG
 {% endif %}
  dns_lookup_realm = false
- dns_canonicalize_hostname = false
- rdns = false
  dns_lookup_kdc = false
  ticket_lifetime = 24h
  renew_lifetime = 7d
  forwardable = true
+{% if env == "staging"
+ dns_canonicalize_hostname = false
+ rdns = false
+{% endif %}
 
 [realms]
 {% if env == "production" %}