diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 6d5b5ad53c..e1552a7581 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -393,78 +393,20 @@ resources:
     properties:
       type: json
       value:
-        external:
+  {%- for network in networks %}
+        {{network.name_lower}}:
           fqdn:
             list_join:
             - '.'
             - - {get_attr: [{{server_resource_name}}, name]}
-              - external
+              - {{network.name.lower()}}
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
             - - {get_attr: [{{server_resource_name}}, name]}
-              - external
-        internal_api:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - internalapi
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - internalapi
-        storage:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - storage
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - storage
-        storage_mgmt:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - storagemgmt
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - storagemgmt
-        tenant:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - tenant
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - tenant
-        management:
-          fqdn:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - management
-              - {get_param: CloudDomain}
-          short:
-            list_join:
-            - '.'
-            - - {get_attr: [{{server_resource_name}}, name]}
-              - management
+              - {{network.name.lower()}}
+  {%- endfor %}
         ctlplane:
           fqdn:
             list_join:
@@ -604,13 +546,10 @@ resources:
             tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
             tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
             tripleo::clouddomain: {get_param: CloudDomain}
-            fqdn_internal_api: {get_attr: [NetHostMap, value, internal_api, fqdn]}
-            fqdn_storage: {get_attr: [NetHostMap, value, storage, fqdn]}
-            fqdn_storage_mgmt: {get_attr: [NetHostMap, value, storage_mgmt, fqdn]}
-            fqdn_tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
-            fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
+  {%- for network in networks %}
+            fqdn_{{network.name_lower}}: {get_attr: [NetHostMap, value, {{network.name_lower}}, fqdn]}
+  {%- endfor %}
             fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
-            fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
             fqdn_canonical: {get_attr: [NetHostMap, value, canonical, fqdn]}
 
   # Resource for site-specific injection of root certificate