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
deleted file mode 100644
index 35c5ddb..0000000
--- a/de/heat-templates/env/bmt410-mstr3-wrkr3-cmp0-gtw0-osd3.yaml
+++ /dev/null
@@ -1,567 +0,0 @@
-resource_registry:
-  "MCP2::NetworkAcc": ../fragments/NetworkAccBM.yaml
-  "MCP2::NetworkAccStorage": ../fragments/NetworkAccVMStorage.yaml
-  "MCP2::NetworkPrvFl": ../fragments/NetworkPrvFl.yaml
-  "MCP2::NetworkIronicFlat": ../fragments/NetworkIronicFlat.yaml
-  "MCP2::SrvInstances": ../fragments/SrvInstancesBM.yaml
-  "MCP2::SrvInstancesCeph": ../fragments/SrvInstancesBMCeph.yaml
-  "MCP2::SrvInstancesCephOSD": ../fragments/SrvInstancesBMCephOSD.yaml
-
-parameters:
-  image: bionic-server-cloudimg-amd64-20190612
-  ucp_flavor: si-bm-410-128-16-hdd0-ssd2x1t
-  masters_flavor: si-bm-410-128-16-hdd0-ssd2x1t
-  workers_flavor: si-bm-410-128-32-hdd0-ssd2x1t
-  cmps_flavor: si-bm-410-128-16-hdd0-ssd1x500g
-  gtws_flavor: oscore-bm-lab-01
-  lmas_flavor: oscore-bm-lab-01
-  osds_flavor: si-bm-410-64-16-hdd2x2t-ssd1x500g
-  spares_flavor: si-bm-410-64-16-hdd2x2t-ssd1x500g-spare
-  masters_size: 2  # UCP nodes
-  worker_size: 3  # OpenStack controller nodes
-  cmp_size: 3
-  gtw_size: 0
-  lma_size: 0
-  osd_size: 3
-  spare_size: 1
-  ucp_boot_timeout: 1200
-  cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
-  public_net_id: 'physnet1-410'
-  control_network_cidr: '172.16.50.128/25'
-  private_floating_network_cidr: '172.16.51.0/25'
-  private_floating_network_pool_start: '172.16.51.10'
-  private_floating_network_pool_end: '172.16.51.30'
-  private_floating_network_ipam_pool_start: '172.16.51.31'
-  private_floating_network_ipam_pool_end: '172.16.51.62'
-  private_floating_network_gateway: '172.16.51.1'
-  private_floating_network_interface: 'os-floating'
-  metallb_address_pools: [ '172.16.51.130-172.16.51.250' ]
-  private_floating_interface: 'os-floating'
-  storage_frontend_interface: 'ceph-control'
-  storage_backend_interface: 'ceph-replica'
-  tunnel_interface: 'os-tenant'
-  live_migration_interface: 'os-tenant'
-  worker_metadata: {"labels": {"openstack-control-plane":"enabled", "openvswitch":"enabled", "openstack-gateway": "enabled","local-volume-provisioner": "enabled","role": "stacklight", "stacklight": "enabled"}}
-  cmp_metadata: {"labels": {"openstack-compute-node":"enabled","openvswitch":"enabled"}}
-  osd_metadata: {"labels": {"role": "ceph-osd-node"}}
-  spare_metadata: {"labels": {"role": "spare-node"}}
-
-  hardware_metadata: |
-    '0c:c4:7a:33:26:7c':
-      write_files:
-      - path: /usr/share/metadata/ceph.yaml
-        content: |
-         storageDevices:
-           - name: sdb
-             role: hdd
-             sizeGb: 500
-           - name: sdc
-             role: hdd
-             sizeGb: 500
-         ramGb: 64
-         cores: 12
-         ips:
-           - 192.168.122.101
-         crushPath: {}
-      - path: '/etc/netplan/99-cz7714-osd.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens3f1: *mtu9100
-              ens3f2: *mtu9100
-              ens3f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens3f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens3f2, ens3f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.10/24 ], mtu: 9100 }
-              ceph-replica: { id: 417, link: bond0, 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
-        content: |
-         storageDevices:
-           - name: sdb
-             role: hdd
-             sizeGb: 500
-           - name: sdc
-             role: hdd
-             sizeGb: 500
-         ramGb: 64
-         cores: 12
-         ips:
-           - 192.168.122.102
-         crushPath: {}
-      - path: '/etc/netplan/99-cz7725-osd.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens3f1: *mtu9100
-              ens3f2: *mtu9100
-              ens3f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens3f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens3f2, ens3f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.11/24 ], mtu: 9100 }
-              ceph-replica: { id: 417, link: bond0, 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
-        content: |
-         storageDevices:
-           - name: sdb
-             role: hdd
-             sizeGb: 500
-           - name: sdc
-             role: hdd
-             sizeGb: 500
-         ramGb: 64
-         cores: 12
-         ips:
-           - 192.168.122.103
-         crushPath: {}
-      - path: '/etc/netplan/99-cz7726-osd.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens3f1: *mtu9100
-              ens3f2: *mtu9100
-              ens3f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens3f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens3f2, ens3f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.12/24 ], mtu: 9100 }
-              ceph-replica: { id: 417, link: bond0, 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'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens3f1: *mtu9100
-              ens3f2: *mtu9100
-              ens3f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens3f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens3f2, ens3f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.13/24 ], mtu: 9100 }
-              ceph-replica: { id: 417, link: bond0, 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'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              ens11f0: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens11f1: *mtu9100
-              ens11f2: *mtu9100
-              ens11f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [ens11f0, ens11f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens11f2, ens11f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.14/24 ], mtu: 9100 }
-    '0c:c4:7a:aa:e0:9c':
-      write_files:
-      - path: '/etc/netplan/99-cz10096-os-control.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              ens11f0: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens11f1: *mtu9100
-              ens11f2: *mtu9100
-              ens11f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [ens11f0, ens11f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens11f2, ens11f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.15/24 ], mtu: 9100 }
-    '0c:c4:7a:aa:78:2c':
-      write_files:
-      - path: '/etc/netplan/99-cz10097-os-control.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              ens11f0: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens11f1: *mtu9100
-              ens11f2: *mtu9100
-              ens11f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [ens11f0, ens11f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens11f2, ens11f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.16/24 ], mtu: 9100 }
-    '0c:c4:7a:aa:78:7a':
-      write_files:
-      - path: '/etc/netplan/99-cz10098-ucp-control.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens4f1: *mtu9100
-              ens4f2: *mtu9100
-              ens4f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens4f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens4f2, ens4f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, link: bond0, addresses: [ {% 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 }
-    '0c:c4:7a:aa:e0:98':
-      write_files:
-      - path: '/etc/netplan/99-cz10099-ucp-control.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens4f1: *mtu9100
-              ens4f2: *mtu9100
-              ens4f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens4f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens4f2, ens4f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, link: bond0, addresses: [ {% 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 }
-    '0c:c4:7a:aa:78:7c':
-      write_files:
-      - path: '/etc/netplan/99-cz10100-ucp-control.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              eno1: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              ens4f1: *mtu9100
-              ens4f2: *mtu9100
-              ens4f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [eno1, ens4f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [ens4f2, ens4f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, link: bond0, addresses: [ {% 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 }
-    '0c:c4:7a:55:6a:28':
-      write_files:
-      - path: '/etc/netplan/99-cz7636-os-compute.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              enp3s0f0: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              enp3s0f1: *mtu9100
-              enp3s0f2: *mtu9100
-              enp3s0f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [enp3s0f0, enp3s0f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [enp3s0f2, enp3s0f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.17/24 ], mtu: 9100 }
-    '0c:c4:7a:54:a2:5e':
-      write_files:
-      - path: '/etc/netplan/99-cz7641-os-compute.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              enp3s0f0: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              enp3s0f1: *mtu9100
-              enp3s0f2: *mtu9100
-              enp3s0f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [enp3s0f0, enp3s0f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [enp3s0f2, enp3s0f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control: { id: 415, link: bond1, addresses: [ {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }} ] , mtu: 9100 }
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.18/24 ], mtu: 9100 }
-    '0c:c4:7a:54:a0:50':
-      write_files:
-      - path: '/etc/netplan/99-cz7642-os-compute.yaml'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              enp3s0f0: &mtu9100
-                dhcp4: false
-                mtu: 9100
-              enp3s0f1: *mtu9100
-              enp3s0f2: *mtu9100
-              enp3s0f3: *mtu9100
-            bonds:
-              bond0:
-                dhcp4: no
-                interfaces: [enp3s0f0, enp3s0f1]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-              bond1:
-                dhcp4: no
-                interfaces: [enp3s0f2, enp3s0f3]
-                parameters:
-                  mode: active-backup
-                  mii-monitor-interval: 1000
-                mtu: 9100
-            vlans:
-              k8s-control: { id: 411, 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 }
-              ceph-control:
-                id: 415
-                link: bond1
-                addresses:
-                - {{ STORAGE_FRONTEND_INTERFACE_IP }}/{{ STORAGE_FRONTEND_NETWORK_NETMASK }}
-                mtu: 9100
-              os-tenant: { id: 416, link: bond1, addresses: [ 10.14.0.19/24 ], mtu: 9100 }
-
-  functions_override: |
-
-    function network_config {
-
-        DEBIAN_FRONTEND=noninteractive apt -y install bridge-utils ifenslave vlan
-        sudo modprobe bonding
-        netplan --debug apply
-        sleep 15
-
-        # Re-init the variables related to the just configured k8s-control network
-        CONTROL_IP_ADDRESS=$(ip route get ${CONTROL_NETWORK_CIDR%/*} | head -n1 | fgrep -v ' via ' | awk '/ src / {print $6}')
-
-        #UCP_MASTER_HOST=${UCP_MASTER_HOST:-${CONTROL_IP_ADDRESS}}
-        # Hardcoded IP for the UCP node because the servers output contain PXE IP instead of k8s_control IP
-        UCP_MASTER_HOST=172.16.50.254
-        UCP_IP_ADDRESS=${UCP_IP_ADDRESS:-$CONTROL_IP_ADDRESS}
-    }
diff --git a/de/heat-templates/env/k0s-mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/k0s-mstr1-wrkr3-cmp0-gtw0.yaml
index 3804aae..b607253 100644
--- a/de/heat-templates/env/k0s-mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/k0s-mstr1-wrkr3-cmp0-gtw0.yaml
@@ -17,7 +17,6 @@
   gtw_size: 0
   lma_size: 0
   osd_size: 0
-  spare_size: 0
   ucp_boot_timeout: 3600
   cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
   private_floating_network_cidr: '10.11.12.0/24'
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
index 8176416..f5c79f1 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
@@ -17,7 +17,6 @@
   gtw_size: 0
   lma_size: 0
   osd_size: 0
-  spare_size: 0
   ucp_boot_timeout: 3600
   cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
   private_floating_network_cidr: '10.11.12.0/24'
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index e160b24..47472d1 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -349,8 +349,7 @@
     }
     retry $NODE_DEPLOYMENT_RETRIES "The node didn't come up." _retry_wait_k0s
 
-    mkdir -p /etc/kubernetes/
-    mkdir -p /root/.kube/
+    mkdir -p /etc/kubernetes /root/.kube/
     k0s kubeconfig admin > /etc/kubernetes/admin.conf
     cp /etc/kubernetes/admin.conf /root/.kube/config
 
@@ -484,15 +483,7 @@
 }
 
 function configure_ntp {
-    cat << EOF > /etc/ntp.conf
-# ntpd will only synchronize your clock.
-
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-
-# Specify one or more NTP servers.
-EOF
+    echo "" > /etc/ntp.conf
 
     for server in $NTP_SERVERS; do
 cat << EOF >> /etc/ntp.conf
@@ -764,9 +755,6 @@
 }
 
 HW_METADATA='{}'
-# Place files specified in metadata to system.
-# For example netplan.io metadata, the restart of services
-# is not covered by script.
 function prepare_metadata_files {
     /usr/sbin/prepare-metadata.py  --metadata-file /usr/share/metadata/lab-metadata.yaml
 }
@@ -1111,30 +1099,6 @@
             configure_lvm
             cron_disable_calico_offloading
             ;;
-        spare)
-            wait_for_external_network
-            prepare_metadata_files
-            disable_rp_filter
-            network_config
-            prepare_network
-            if [[ "${KUBERNETES_INSTALLER}" == "ucp" ]]; then
-                prepare_docker_config
-            fi
-            install_required_packages
-            configure_ntp
-            configure_atop
-            if [[ "${KUBERNETES_INSTALLER}" == "ucp" ]]; then
-                install_docker
-                cache_images
-                download_bundles
-            fi
-            workaround_default_forward_policy
-            configure_contrack
-            if [[ "${KUBERNETES_INSTALLER}" == "ucp" ]]; then
-                disable_iptables_for_bridges
-            fi
-            cron_disable_calico_offloading
-            ;;
         frr)
             wait_for_external_network
             prepare_metadata_files
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 10c1c6b..0b6f59a 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -64,10 +64,6 @@
     type: number
     description: Number of gtw workers to deploy
     default: 0
-  spare_size:
-    type: number
-    description: Number of gtw workers to deploy
-    default: 0
   frr_size:
     type: number
     description: Number of frr nodes to deploy
@@ -215,9 +211,6 @@
   osd_metadata:
     type: json
     default: {}
-  spare_metadata:
-    type: json
-    default: {}
   frr_metadata:
     type: json
     default: {}
@@ -251,9 +244,6 @@
   osds_flavor:
     type: string
     default: 'system.virtual.ceph.osd'
-  spares_flavor:
-    type: string
-    default: 'system.compact.openstack.control'
   frrs_flavor:
     type: string
     default: 'system.compact.openstack.control'
@@ -799,54 +789,6 @@
           frr_bgp_neighbors: { list_join: [',', {get_attr: [workers, server_tun_ip]}] }
           availability_zone: { get_param: availability_zone }
 
-  spares:  # spares for osds/cmps
-    type: OS::Heat::ResourceGroup
-    depends_on:
-     - ucp
-    properties:
-      count: { get_param: spare_size }
-      resource_def:
-        type: MCP2::SrvInstancesCephOSD
-        properties:
-          metadata: { get_param: spare_metadata }
-          node_type: "spare"
-          kubernetes_installer: { get_param: kubernetes_installer }
-          key_name: { get_attr: [keypair_name, value] }
-          image: { get_param: image }
-          flavor: { get_param: spares_flavor }
-          docker_ee_url: { get_param: docker_ee_url }
-          docker_ee_release: { get_param: docker_ee_release }
-          docker_ucp_image: { get_param: docker_ucp_image}
-          docker_default_address_pool: { get_param: docker_default_address_pool }
-          accessible_network: { get_attr: [accessible_network, public_network] }
-          private_floating_network: { get_attr: [private_floating_network, private_floating_network_id] }
-          private_floating_subnet_id: { get_attr: [private_floating_network, private_floating_subnet_id] }
-          private_floating_interface: { get_param: private_floating_interface }
-          private_floating_network_cidr: { get_param: private_floating_network_cidr }
-          accessible_subnet_id: { get_attr: [accessible_network, accessible_subnet_id]}
-          public_net_id: { get_param: public_net_id }
-          control_network_cidr: { get_param: control_network_cidr }
-          ucp_master_host: { get_attr: [ucp, server_private_ip] }
-          functions_override: { get_param: functions_override }
-          storage_frontend_interface: { get_param: storage_frontend_interface }
-          storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
-          storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
-          storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
-          storage_backend_interface: { get_param: storage_backend_interface }
-          storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
-          storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id] }
-          storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
-          ironic_baremetal_network: { get_attr: [ironic_baremetal_network, ironic_baremetal_network_id] }
-          ironic_baremetal_subnet_id: { get_attr: [ironic_baremetal_network, ironic_baremetal_subnet_id] }
-          ironic_baremetal_network_cidr: { get_param: ironic_baremetal_network_cidr }
-          ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
-          ironic_mt_enabled: { get_param: ironic_mt_enabled }
-          tungstenfabric_enabled: { get_param: tungstenfabric_enabled }
-          tun_network: { get_attr: [tun_network, tun_network_id] }
-          tun_subnet_id: { get_attr: [tun_network, tun_subnet_id] }
-          hardware_metadata: { get_param: hardware_metadata}
-          availability_zone: { get_param: availability_zone }
-
   ntws:
     type: OS::Heat::ResourceGroup
     depends_on:
@@ -961,9 +903,6 @@
   osds_ips:
     description: Private IP addresses of the deployed osd instances
     value: { get_attr: [osds, server_public_ip] }
-  spares_ips:
-    description: Private IP addresses of the deployed spare instances
-    value: { get_attr: [spares, server_public_ip] }
   ntws_ips:
     description: Private IP addresses of the deployed contrail instances
     value: { get_attr: [ntws, server_public_ip] }