diff --git a/network/network.j2 b/network/network.j2
index f2fc759fe8..a7499a8d33 100644
--- a/network/network.j2
+++ b/network/network.j2
@@ -228,25 +228,13 @@ outputs:
   network_cidrs:
     description: List of {{network.name}} network's subnets in CIDR notation.
     value:
-      list_concat:
-        if:
-          - manage_networks
-          - - - {get_attr: [{{network.name}}Subnet, cidr]}
-            -
+      if:
+        - manage_networks
+        - - {get_attr: [{{network.name}}Subnet, cidr]}
 {%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
-              - {get_attr: [{{network.name}}Subnet_{{subnet}}, cidr]}
+          - {get_attr: [{{network.name}}Subnet_{{subnet}}, cidr]}
 {%- endfor %}
-          - -
-{%- if network.ipv6 or ipv6_override %}
-              - {{network.ipv6_subnet|default(network.ip_subnet|default(""))}}
-{%- else %}
-              - "{{network.ip_subnet|default("")}}"
-{%- endif %}
-            -
+        - - {get_param: {{network.name}}NetCidr}
 {%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
-{%-     if network.ipv6 or ipv6_override %}
-              - "{{network.subnets[subnet]['ipv6_subnet']|default(network.subnets[subnet]['ip_subnet']|default(""))}}"
-{%-     else %}
-              - "{{network.subnets[subnet]['ip_subnet']|default("")}}"
-{%-     endif %}
+          - {get_param: {{network.name}}SubnetCidr_{{subnet}}}
 {%- endfor %}