diff --git a/network/external.yaml b/network/external.yaml
index 8dbe3e2027..708d46356f 100644
--- a/network/external.yaml
+++ b/network/external.yaml
@@ -66,4 +66,4 @@ outputs:
     description: Neutron external network
     value: {get_resource: ExternalNetwork}
   subnet_cidr:
-    value: {get_attr: ExternalSubnet, cidr}
+    value: {get_attr: [ExternalSubnet, cidr]}
diff --git a/network/external_v6.yaml b/network/external_v6.yaml
index 3266932a40..9d1c3d0016 100644
--- a/network/external_v6.yaml
+++ b/network/external_v6.yaml
@@ -73,4 +73,4 @@ outputs:
     description: Neutron external network
     value: {get_resource: ExternalNetwork}
   subnet_cidr:
-    value: {get_attr: ExternalSubnet, cidr}
+    value: {get_attr: [ExternalSubnet, cidr]}
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
index 7ff0dafdc4..6e1885a9ae 100644
--- a/network/internal_api.yaml
+++ b/network/internal_api.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron internal network
     value: {get_resource: InternalApiNetwork}
   subnet_cidr:
-    value: {get_attr: InternalApiSubnet, cidr}
+    value: {get_attr: [InternalApiSubnet, cidr]}
diff --git a/network/internal_api_v6.yaml b/network/internal_api_v6.yaml
index 0688f1383a..7264b1c000 100644
--- a/network/internal_api_v6.yaml
+++ b/network/internal_api_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron internal network
     value: {get_resource: InternalApiNetwork}
   subnet_cidr:
-    value: {get_attr: InternalApiSubnet, cidr}
+    value: {get_attr: [InternalApiSubnet, cidr]}
diff --git a/network/management.yaml b/network/management.yaml
index d9f773c195..be197e5c48 100644
--- a/network/management.yaml
+++ b/network/management.yaml
@@ -67,4 +67,4 @@ outputs:
     description: Neutron management network
     value: {get_resource: ManagementNetwork}
   subnet_cidr:
-    value: {get_attr: ManagementSubnet, cidr}
+    value: {get_attr: [ManagementSubnet, cidr]}
diff --git a/network/management_v6.yaml b/network/management_v6.yaml
index bf7155137d..2eb8c876f4 100644
--- a/network/management_v6.yaml
+++ b/network/management_v6.yaml
@@ -68,4 +68,4 @@ outputs:
     description: Neutron management network
     value: {get_resource: ManagementNetwork}
   subnet_cidr:
-    value: {get_attr: ManagementSubnet, cidr}
+    value: {get_attr: [ManagementSubnet, cidr]}
diff --git a/network/network.network.j2.yaml b/network/network.network.j2.yaml
index 2c223c166a..ccf437bb3a 100644
--- a/network/network.network.j2.yaml
+++ b/network/network.network.j2.yaml
@@ -88,5 +88,4 @@ outputs:
     description: {{network.name_lower}} network
     value: {get_resource: {{network.name}}Network}
   subnet_cidr:
-    value: {get_attr: {{network.name}}Subnet, cidr}
-
+    value: {get_attr: [{{network.name}}Subnet, cidr]}
diff --git a/network/storage.yaml b/network/storage.yaml
index 00316c51d3..9729044de4 100644
--- a/network/storage.yaml
+++ b/network/storage.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron storage network
     value: {get_resource: StorageNetwork}
   subnet_cidr:
-    value: {get_attr: StorageSubnet, cidr}
+    value: {get_attr: [StorageSubnet, cidr]}
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index bc4347c234..fc005573d5 100644
--- a/network/storage_mgmt.yaml
+++ b/network/storage_mgmt.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron storage management network
     value: {get_resource: StorageMgmtNetwork}
   subnet_cidr:
-    value: {get_attr: StorageMgmtSubnet, cidr}
+    value: {get_attr: [StorageMgmtSubnet, cidr]}
diff --git a/network/storage_mgmt_v6.yaml b/network/storage_mgmt_v6.yaml
index 0d6614f941..cef87de9ca 100644
--- a/network/storage_mgmt_v6.yaml
+++ b/network/storage_mgmt_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron storage management network
     value: {get_resource: StorageMgmtNetwork}
   subnet_cidr:
-    value: {get_attr: StorageMgmtSubnet, cidr}
+    value: {get_attr: [StorageMgmtSubnet, cidr]}
diff --git a/network/storage_v6.yaml b/network/storage_v6.yaml
index bf796b2be6..51edd4b340 100644
--- a/network/storage_v6.yaml
+++ b/network/storage_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron storage network
     value: {get_resource: StorageNetwork}
   subnet_cidr:
-    value: {get_attr: StorageSubnet, cidr}
+    value: {get_attr: [StorageSubnet, cidr]}
diff --git a/network/tenant.yaml b/network/tenant.yaml
index 2104f0bd0b..67c4abbcca 100644
--- a/network/tenant.yaml
+++ b/network/tenant.yaml
@@ -62,4 +62,4 @@ outputs:
     description: Neutron tenant network
     value: {get_resource: TenantNetwork}
   subnet_cidr:
-    value: {get_attr: TenantSubnet, cidr}
+    value: {get_attr: [TenantSubnet, cidr]}
diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml
index 9993eec9b2..9f139cb1e7 100644
--- a/network/tenant_v6.yaml
+++ b/network/tenant_v6.yaml
@@ -69,4 +69,4 @@ outputs:
     description: Neutron tenant network
     value: {get_resource: TenantNetwork}
   subnet_cidr:
-    value: {get_attr: TenantSubnet, cidr}
+    value: {get_attr: [TenantSubnet, cidr]}