diff --git a/trymos/heat-templates/env/aio.yaml b/trymos/heat-templates/env/aio.yaml
index 7fc1f5c..d0d2cb5 100644
--- a/trymos/heat-templates/env/aio.yaml
+++ b/trymos/heat-templates/env/aio.yaml
@@ -10,21 +10,3 @@
   private_floating_interface: ''
   #compact.cid: RAM 32768 | Disk 100 | VCPU 8
   ucp_flavor: 'mosk.aio.ephemeral'
-  hardware_metadata: |
-    '00:00:00:00:00:00':
-      write_files:
-        - path: /usr/share/metadata/ceph.yaml
-          content: |
-            storageDevices:
-              - name: vdb
-                role: hdd
-                sizeGb: 2
-            ramGb: 8
-            cores: 2
-            # The roles will be assigned based on node labels.
-            # roles:
-            #   - mon
-            #   - mgr
-            ips:
-              - 192.168.122.101
-            crushPath: {}
diff --git a/trymos/heat-templates/fragments/NetworkAccVM.yaml b/trymos/heat-templates/fragments/NetworkAccVM.yaml
index 66515d2..38977a8 100644
--- a/trymos/heat-templates/fragments/NetworkAccVM.yaml
+++ b/trymos/heat-templates/fragments/NetworkAccVM.yaml
@@ -5,6 +5,9 @@
     type: string
   control_network_cidr:
     type: string
+  dns_nameservers:
+    type: json
+    default: []
 
 resources:
 
@@ -16,9 +19,8 @@
       network: { get_resource: network }
       enable_dhcp: true
       cidr: { get_param: control_network_cidr }
-      dns_nameservers:
-        - 172.18.224.6
-        - 172.18.176.6
+      dns_nameservers: { get_param: dns_nameservers }
+
   router:
     type: OS::Neutron::Router
     properties:
diff --git a/trymos/heat-templates/fragments/SrvInstancesVM.yaml b/trymos/heat-templates/fragments/SrvInstancesVM.yaml
index 94c792b..6cb7293 100644
--- a/trymos/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/trymos/heat-templates/fragments/SrvInstancesVM.yaml
@@ -37,10 +37,6 @@
     default: 4789
   docker_default_address_pool:
     type: string
-  hardware_metadata:
-    description: The content of lab metadata.
-    default: ''
-    type: string
   user_data_config:
     description: This is part of clout-config which denies to mount drive with label ephemeral0 to /mnt
     type: string
@@ -70,22 +66,11 @@
             $docker_ucp_swarm_data_port: { get_param: docker_ucp_swarm_data_port }
             $docker_default_address_pool: { get_param: docker_default_address_pool }
 
-  inject_files:
-    type: "OS::Heat::CloudConfig"
-    properties:
-      cloud_config:
-        write_files:
-          - path: /usr/share/metadata/lab-metadata.yaml
-            owner: "root:root"
-            permissions: "0644"
-            content: { get_param: hardware_metadata}
-
   install_config_agent:
     type: "OS::Heat::MultipartMime"
     properties:
       parts:
       - config: {get_resource: software_config}
-      - config: {get_resource: inject_files}
       - config: {get_param: user_data_config}
 
   server:
diff --git a/trymos/heat-templates/top.yaml b/trymos/heat-templates/top.yaml
index f8b330f..704437d 100644
--- a/trymos/heat-templates/top.yaml
+++ b/trymos/heat-templates/top.yaml
@@ -39,10 +39,9 @@
   private_floating_network_cidr:
     type: string
     default: '10.11.12.0/24'
-  hardware_metadata:
-    description: The content of lab metadata.
-    default: ''
-    type: string
+  dns_nameservers:
+    type: json
+    default: []
 
 resources:
   keypair_name:
@@ -63,6 +62,7 @@
     properties:
       public_net_id: { get_param: public_net_id }
       control_network_cidr: { get_param: control_network_cidr }
+      dns_nameservers: { get_param: dns_nameservers }
 
   ucp:
     depends_on:
@@ -81,7 +81,6 @@
       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 }
-      hardware_metadata: { get_param: hardware_metadata}
 
 outputs:
   ucp_ips: