diff --git a/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml b/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
index bad2f31..d8630d4 100644
--- a/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
+++ b/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
@@ -46,7 +46,6 @@
   osd_metadata: {"labels": {"role": "ceph-osd-node"}}
   spare_metadata: {"labels": {"role": "spare-node"}}
 
-
   hardware_metadata: |
     '0c:c4:7a:33:26:7c':
       write_files:
@@ -96,15 +95,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.130/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -123,7 +116,6 @@
                 addresses:
                 - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
                 mtu: 9100
-
     '0c:c4:7a:33:26:6e':
       write_files:
       - path: /usr/share/metadata/ceph.yaml
@@ -172,15 +164,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.131/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -199,7 +185,6 @@
                 addresses:
                 - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
                 mtu: 9100
-
     '0c:c4:7a:33:26:6a':
       write_files:
       - path: /usr/share/metadata/ceph.yaml
@@ -248,15 +233,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.132/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -275,7 +254,6 @@
                 addresses:
                 - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
                 mtu: 9100
-
     '0c:c4:7a:34:92:94':
       write_files:
       - path: '/etc/netplan/99-cz7727-spare.yaml'
@@ -310,15 +288,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.133/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -337,7 +309,6 @@
                 addresses:
                 - {{ STORAGE_BACKEND_INTERFACE_IP }}/{{ STORAGE_BACKEND_NETWORK_NETMASK }}
                 mtu: 9100
-
     '0c:c4:7a:aa:e0:9e':
       write_files:
       - path: '/etc/netplan/99-cz10095-os-control.yaml'
@@ -372,15 +343,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.134/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -393,7 +358,6 @@
                 addresses:
                 - 10.14.0.14/24
                 mtu: 9100
-
     '0c:c4:7a:aa:e0:9c':
       write_files:
       - path: '/etc/netplan/99-cz10096-os-control.yaml'
@@ -428,15 +392,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.135/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -449,7 +407,6 @@
                 addresses:
                 - 10.14.0.15/24
                 mtu: 9100
-
     '0c:c4:7a:aa:78:2c':
       write_files:
       - path: '/etc/netplan/99-cz10097-os-control.yaml'
@@ -484,15 +441,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.136/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -505,7 +456,6 @@
                 addresses:
                 - 10.14.0.16/24
                 mtu: 9100
-
     '0c:c4:7a:aa:78:7a':
       write_files:
       - path: '/etc/netplan/99-cz10098-ucp-control.yaml'
@@ -539,18 +489,10 @@
                 id: 411
                 link: bond0
                 addresses:
-                # Hardcoded IP for the UCP node (when UCP_MASTER_HOST is empty), to replace PXE with k8s_control IP
                 - {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.137/25{% endif %}
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
-
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
     '0c:c4:7a:aa:e0:98':
       write_files:
       - path: '/etc/netplan/99-cz10099-ucp-control.yaml'
@@ -584,18 +526,10 @@
                 id: 411
                 link: bond0
                 addresses:
-                # Hardcoded IP for the UCP node (when UCP_MASTER_HOST is empty), to replace PXE with k8s_control IP
                 - {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.138/25{% endif %}
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
-
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
     '0c:c4:7a:aa:78:7c':
       write_files:
       - path: '/etc/netplan/99-cz10100-ucp-control.yaml'
@@ -629,18 +563,10 @@
                 id: 411
                 link: bond0
                 addresses:
-                # Hardcoded IP for the UCP node (when UCP_MASTER_HOST is empty), to replace PXE with k8s_control IP
                 - {% if UCP_MASTER_HOST == "" %}172.16.50.254/25{% else %}172.16.50.139/25{% endif %}
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
-
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
     '0c:c4:7a:55:6a:28':
       write_files:
       - path: '/etc/netplan/99-cz7636-os-compute.yaml'
@@ -675,15 +601,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.140/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -696,7 +616,6 @@
                 addresses:
                 - 10.14.0.17/24
                 mtu: 9100
-
     '0c:c4:7a:54:a2:5e':
       write_files:
       - path: '/etc/netplan/99-cz7641-os-compute.yaml'
@@ -731,15 +650,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.141/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -752,7 +665,6 @@
                 addresses:
                 - 10.14.0.18/24
                 mtu: 9100
-
     '0c:c4:7a:54:a0:50':
       write_files:
       - path: '/etc/netplan/99-cz7642-os-compute.yaml'
@@ -787,15 +699,9 @@
                 link: bond0
                 addresses:
                 - 172.16.50.142/25
-              os-floating:
-                id: 412
-                link: bond1
-              k8s-metallb:
-                id: 413
-                link: bond0
-              management:
-                id: 414
-                link: bond0
+              os-floating: { id: 412, link: bond1 }
+              k8s-metallb: { id: 413, link: bond0 }
+              management: { id: 414, link: bond0 }
               ceph-control:
                 id: 415
                 link: bond1
@@ -809,7 +715,6 @@
                 - 10.14.0.19/24
                 mtu: 9100
 
-
   functions_override: |
 
     function network_config {