diff --git a/metadata/service/nodes_flat.yml b/metadata/service/nodes_flat.yml
new file mode 100644
index 0000000..0e1b96a
--- /dev/null
+++ b/metadata/service/nodes_flat.yml
@@ -0,0 +1,62 @@
+applications:
+  - baremetal_simulator
+parameters:
+  ironic:
+    client:
+      enabled: true
+      nodes:
+        admin_identity:
+          - name: ${linux:network:hostname}-n0
+            driver: pxe_ipmitool
+            properties:
+              local_gb: 10
+              cpus: 2
+              memory_mb: 1024
+              cpu_arch: x86_64
+            driver_info:
+              ipmi_username: admin
+              ipmi_password: password
+              ipmi_address: ${_param:single_address}
+              ipmi_port: 6200
+              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
+            ports:
+              - address: aa:bb:cc:dd:00:00
+              - address: aa:bb:cc:dd:00:01
+          - name: ${linux:network:hostname}-n1
+            driver: pxe_ipmitool
+            properties:
+              local_gb: 10
+              cpus: 2
+              memory_mb: 1024
+              cpu_arch: x86_64
+            driver_info:
+              ipmi_username: admin
+              ipmi_password: password
+              ipmi_address: ${_param:single_address}
+              ipmi_port: 6201
+              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
+            ports:
+              - address: aa:bb:cc:dd:01:00
+            deployment_profile:
+              network:
+                fixed_ips:
+                  - ip_address: 192.168.90.111
+                    subnet_name: baremetal-subnet
+          - name: ${linux:network:hostname}-n2
+            driver: pxe_ipmitool
+            properties:
+              local_gb: 10
+              cpus: 2
+              memory_mb: 1024
+              cpu_arch: x86_64
+            driver_info:
+              ipmi_username: admin
+              ipmi_password: password
+              ipmi_address: ${_param:single_address}
+              ipmi_port: 6202
+              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
+            ports:
+              - address: aa:bb:cc:dd:02:00
diff --git a/metadata/service/nodes_neutron.yml b/metadata/service/nodes_neutron.yml
new file mode 100644
index 0000000..221bb21
--- /dev/null
+++ b/metadata/service/nodes_neutron.yml
@@ -0,0 +1,88 @@
+applications:
+  - baremetal_simulator
+parameters:
+  ironic:
+    client:
+      enabled: true
+      nodes:
+        admin_identity:
+          - name: ${linux:network:hostname}-n0
+            driver: pxe_ipmitool
+            properties:
+              local_gb: 10
+              cpus: 2
+              memory_mb: 1024
+              cpu_arch: x86_64
+            driver_info:
+              ipmi_username: admin
+              ipmi_password: password
+              ipmi_address: ${_param:single_address}
+              ipmi_port: 6200
+              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
+            network_interface: 'neutron'
+            ironic_api_version: '1.20'
+            ports:
+              - address: aa:bb:cc:dd:00:00
+                local_link_connection:
+                  switch_id: 00:00:00:00:00:00
+                  switch_info: br-simulator
+                  port_id: tap-bmt-n0i1
+                ironic_api_version: '1.19'
+              - address: aa:bb:cc:dd:00:01
+                local_link_connection:
+                  switch_id: 00:00:00:00:00:00
+                  switch_info: br-simulator
+                  port_id: tap-bmt-n0i2
+                ironic_api_version: '1.19'
+          - name: ${linux:network:hostname}-n1
+            driver: pxe_ipmitool
+            properties:
+              local_gb: 10
+              cpus: 2
+              memory_mb: 1024
+              cpu_arch: x86_64
+            driver_info:
+              ipmi_username: admin
+              ipmi_password: password
+              ipmi_address: ${_param:single_address}
+              ipmi_port: 6201
+              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
+            network_interface: 'neutron'
+            ironic_api_version: '1.20'
+            ports:
+              - address: aa:bb:cc:dd:01:00
+                local_link_connection:
+                  switch_id: 00:00:00:00:00:00
+                  switch_info: br-simulator
+                  port_id: tap-bmt-n1i1
+                ironic_api_version: '1.19'
+            deployment_profile:
+              network:
+                fixed_ips:
+                  - ip_address: 192.168.90.111
+                    subnet_name: baremetal-subnet
+          - name: ${linux:network:hostname}-n2
+            driver: pxe_ipmitool
+            properties:
+              local_gb: 10
+              cpus: 2
+              memory_mb: 1024
+              cpu_arch: x86_64
+            driver_info:
+              ipmi_username: admin
+              ipmi_password: password
+              ipmi_address: ${_param:single_address}
+              ipmi_port: 6202
+              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
+              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
+            network_interface: 'neutron'
+            ironic_api_version: '1.20'
+            ports:
+              - address: aa:bb:cc:dd:02:00
+                local_link_connection:
+                  switch_id: 00:00:00:00:00:00
+                  switch_info: br-simulator
+                  port_id: tap-bmt-n2i1
+                ironic_api_version: '1.19'
diff --git a/metadata/service/simulator.yml b/metadata/service/simulator.yml
index 5a2e271..1a3c859 100644
--- a/metadata/service/simulator.yml
+++ b/metadata/service/simulator.yml
@@ -40,62 +40,6 @@
                 key0: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
           network:
             name: baremetal-flat-network
-      nodes:
-        admin_identity:
-          - name: ${linux:network:hostname}-n0
-            driver: pxe_ipmitool
-            properties:
-              local_gb: 10
-              cpus: 2
-              memory_mb: 1024
-              cpu_arch: x86_64
-            driver_info:
-              ipmi_username: admin
-              ipmi_password: password
-              ipmi_address: ${_param:single_address}
-              ipmi_port: 6200
-              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
-              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
-            ports:
-              - address: aa:bb:cc:dd:00:00
-              - address: aa:bb:cc:dd:00:01
-          - name: ${linux:network:hostname}-n1
-            driver: pxe_ipmitool
-            properties:
-              local_gb: 10
-              cpus: 2
-              memory_mb: 1024
-              cpu_arch: x86_64
-            driver_info:
-              ipmi_username: admin
-              ipmi_password: password
-              ipmi_address: ${_param:single_address}
-              ipmi_port: 6201
-              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
-              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
-            ports:
-              - address: aa:bb:cc:dd:01:00
-            deployment_profile:
-              network:
-                fixed_ips:
-                  - ip_address: 192.168.90.111
-                    subnet_name: baremetal-subnet
-          - name: ${linux:network:hostname}-n2
-            driver: pxe_ipmitool
-            properties:
-              local_gb: 10
-              cpus: 2
-              memory_mb: 1024
-              cpu_arch: x86_64
-            driver_info:
-              ipmi_username: admin
-              ipmi_password: password
-              ipmi_address: ${_param:single_address}
-              ipmi_port: 6202
-              deploy_ramdisk: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_ramdisk_file}
-              deploy_kernel: http://${_param:single_baremetal_address}/${baremetal_simulator:deploy_kernel_file}
-            ports:
-              - address: aa:bb:cc:dd:02:00
   linux:
     network:
       bridge: openvswitch