diff --git a/metadata/service/nodes_flat.yml b/metadata/service/nodes_flat.yml
index 705ea37..9ede4c3 100644
--- a/metadata/service/nodes_flat.yml
+++ b/metadata/service/nodes_flat.yml
@@ -10,7 +10,7 @@
         admin_identity:
           - name: ${linux:network:hostname}-n0
             driver: pxe_ipmitool
-            microversion: '1.9'
+            microversion: '1.33'
             properties:
               local_gb: 10
               cpus: 1
@@ -24,6 +24,7 @@
               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}
+            storage_interface: 'cinder'
             ports:
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:00:00"
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:00:01"
@@ -33,7 +34,7 @@
                 volume_type: iqn
           - name: ${linux:network:hostname}-n1
             driver: pxe_ipmitool
-            microversion: '1.9'
+            microversion: '1.33'
             properties:
               local_gb: 10
               cpus: 1
@@ -47,6 +48,7 @@
               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}
+            storage_interface: 'cinder'
             ports:
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:01:00"
             deployment_profile:
@@ -60,7 +62,7 @@
                 volume_type: iqn
           - name: ${linux:network:hostname}-n2
             driver: pxe_ipmitool
-            microversion: '1.9'
+            microversion: '1.33'
             properties:
               local_gb: 10
               cpus: 1
@@ -74,6 +76,7 @@
               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}
+            storage_interface: 'cinder'
             ports:
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:02:00"
             volume_connectors:
diff --git a/metadata/service/nodes_neutron.yml b/metadata/service/nodes_neutron.yml
index e090b54..e6f1966 100644
--- a/metadata/service/nodes_neutron.yml
+++ b/metadata/service/nodes_neutron.yml
@@ -24,20 +24,21 @@
               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'
-            microversion: '1.20'
+            storage_interface: 'cinder'
+            microversion: '1.33'
             ports:
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:00:00"
                 local_link_connection:
                   switch_id: 00:00:00:00:00:00
                   switch_info: br-simulator
                   port_id: tap-bmt-n0i1
-                microversion: '1.19'
+                microversion: '1.33'
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:00:01"
                 local_link_connection:
                   switch_id: 00:00:00:00:00:00
                   switch_info: br-simulator
                   port_id: tap-bmt-n0i2
-                microversion: '1.19'
+                microversion: '1.33'
             volume_connectors:
               vc0:
                 name: iqn.2017-05.org.openstack.${linux:network:hostname}-n0-vc0
@@ -58,14 +59,15 @@
               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'
-            microversion: '1.20'
+            storage_interface: 'cinder'
+            microversion: '1.33'
             ports:
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:01:00"
                 local_link_connection:
                   switch_id: 00:00:00:00:00:00
                   switch_info: br-simulator
                   port_id: tap-bmt-n1i1
-                microversion: '1.19'
+                microversion: '1.33'
             deployment_profile:
               network:
                 fixed_ips:
@@ -91,14 +93,15 @@
               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'
-            microversion: '1.20'
+            storage_interface: 'cinder'
+            microversion: '1.33'
             ports:
               - address: "${_param:openstack_baremetal_simulator_mac_vendor}:dd:02:00"
                 local_link_connection:
                   switch_id: 00:00:00:00:00:00
                   switch_info: br-simulator
                   port_id: tap-bmt-n2i1
-                microversion: '1.19'
+                microversion: '1.33'
             volume_connectors:
               vc0:
                 name: iqn.2017-05.org.openstack.${linux:network:hostname}-n2-vc0