diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index 5c23950aec..0107cce409 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -90,24 +90,26 @@ parameters:
       EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
       # HaproxyNetwork currently only controls the haproxy.stats network binding
       HaproxyNetwork: ctlplane
-      # We special-case the default ResolveNetwork for the Ceph roles
+      # We special-case the default ResolveNetwork and MetricsQdrNetwork for the Ceph roles
       # for backwards compatibility, all other roles default to internal_api
-{%- for role in roles if role.name.startswith('Ceph') %}
+{%- for role in roles %}
+  {%- if role.name.startswith('Ceph') %}
+    {%- if 'Storage' in role.networks %}
       {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
-{%- endfor %}
-{%- for role in roles if not role.name.startswith('Ceph') %}
-    {%- if 'InternalApi' in role.networks %}
-      {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
+      {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
     {%- else %}
       {{role.name}}HostnameResolveNetwork: ctlplane
+      {{role.name}}MetricsQdrNetwork: ctlplane
     {%- endif %}
-{%- endfor %}
-      # special-case for MetricsQdrNetwork, which will vary depending on role
-{%- for role in roles if role.name == 'CephStorage' or role.name == 'BlockStorage' or role.name == 'ObjectStorage' %}
-      {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
-{%- endfor %}
-{%- for role in roles if role.name != 'CephStorage' and role.name != 'BlockStorage' and role.name != 'ObjectStorage' %}
+  {%- else %}
+    {%- if 'InternalApi' in role.networks %}
+      {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
       {{role.name}}MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
+    {%- else %}
+      {{role.name}}HostnameResolveNetwork: ctlplane
+      {{role.name}}MetricsQdrNetwork: ctlplane
+    {%- endif %}
+  {%- endif %}
 {%- endfor %}
 
     description: Mapping of service_name -> network name. Typically set