diff --git a/roles/base/templates/krb5.conf.j2 b/roles/base/templates/krb5.conf.j2
index 39769c01d1..54c52a27f2 100644
--- a/roles/base/templates/krb5.conf.j2
+++ b/roles/base/templates/krb5.conf.j2
@@ -9,7 +9,7 @@
 {% else %}
  default_realm = STG.FEDORAPROJECT.ORG
 {% endif %}
-{% if inventory_hostname.startswith('buildvm-05.stg') %}
+{% if inventory_hostname.startswith('buildvm') and env=="staging" %}
  dns_canonicalize_hostname = false
 {% endif %}
  dns_lookup_realm = false