diff --git a/environments/enable-internal-tls.yaml b/environments/enable-internal-tls.j2.yaml
similarity index 85%
rename from environments/enable-internal-tls.yaml
rename to environments/enable-internal-tls.j2.yaml
index 9a9e565a9c..c93703d8a6 100644
--- a/environments/enable-internal-tls.yaml
+++ b/environments/enable-internal-tls.j2.yaml
@@ -24,4 +24,6 @@ resource_registry:
 
   # Creates nova metadata that will create the extra service principals per
   # node.
-  OS::TripleO::ServiceServerMetadataHook: ../extraconfig/nova_metadata/krb-service-principals.yaml
+{%- for role in roles %}
+  OS::TripleO::{{role.name}}ServiceServerMetadataHook: ../extraconfig/nova_metadata/krb-service-principals/{{role.name.lower()}}-role.yaml
+{%- endfor %}