diff --git a/network/config/bond-with-vlans/role.role.j2.yaml b/network/config/bond-with-vlans/role.role.j2.yaml
index c6d486f86a..8e7e65a797 100644
--- a/network/config/bond-with-vlans/role.role.j2.yaml
+++ b/network/config/bond-with-vlans/role.role.j2.yaml
@@ -87,9 +87,13 @@ resources:
                   next_hop:
                     get_param: ControlPlaneDefaultRoute
 {%- endif %}
-{%- if role.name != 'ComputeOvsDpdk' %}
+{%- if not role.name.startswith('ComputeOvsDpdk') %}
               - type: ovs_bridge
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                name: br-bond
+{%- else %}
                 name: bridge_name
+{% endif %}
                 dns_servers:
                   get_param: DnsServers
                 members:
diff --git a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
index 87d82c789f..c9d8e79448 100644
--- a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
+++ b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml
@@ -58,7 +58,11 @@ resources:
             $network_config:
               network_config:
               - type: linux_bridge
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                name: br-storage
+{%- else %}
                 name: bridge_name
+{%- endif %}
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers
@@ -86,7 +90,11 @@ resources:
               - type: vlan
                 vlan_id:
                   get_param: {{network.name}}NetworkVlanID
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                device: br-storage
+{%- else %}
                 device: bridge_name
+{%- endif %}
                 addresses:
                 - ip_netmask:
                     get_param: {{network.name}}IpSubnet
diff --git a/network/config/single-nic-vlans/role.role.j2.yaml b/network/config/single-nic-vlans/role.role.j2.yaml
index 03e281f4fc..0abc7ba5a7 100644
--- a/network/config/single-nic-vlans/role.role.j2.yaml
+++ b/network/config/single-nic-vlans/role.role.j2.yaml
@@ -58,7 +58,11 @@ resources:
             $network_config:
               network_config:
               - type: ovs_bridge
+{%- if role.name.startswith('CephStorage') or role.name.startswith('ObjectStorage') or role.name.startswith('BlockStorage') %}
+                name: br-storage
+{%- else %}
                 name: bridge_name
+{%- endif %}
                 use_dhcp: false
                 dns_servers:
                   get_param: DnsServers