diff --git a/baremetal_simulator/init.sls b/baremetal_simulator/init.sls
index 0f79f65..62f2051 100644
--- a/baremetal_simulator/init.sls
+++ b/baremetal_simulator/init.sls
@@ -21,35 +21,6 @@
     - name: /etc/libvirt/qemu.conf
     - source: salt://baremetal_simulator/files/qemu-cgroup.conf
 
-brbm:
-  openvswitch_bridge.present
-
-brbm-phy_veth_present:
-  cmd.run:
-    - name: ip link add ovs-brbm type veth peer name brbm-phy && ip link set dev ovs-brbm up && ip link set dev brbm-phy up
-    - unless: ip link show brbm-phy
-
-brbm-phy_phy_ip:
-  cmd.run:
-    - name: ip addr add {{ baremetal_simulator.brbm_net.ip }}/{{ baremetal_simulator.brbm_net.prefix }} dev brbm-phy
-    - unless: ip addr show dev brbm-phy |grep -q {{ baremetal_simulator.brbm_net.ip }}
-    - require:
-      - brbm-phy_veth_present
-
-ovs-brbm_in_ovs:
-  openvswitch_port.present:
-    - name: ovs-brbm
-    - bridge: brbm
-    - require:
-       - brbm-phy_veth_present
-
-brbm-to-ovs:
-  cmd.run:
-    - names:
-      - ovs-vsctl --may-exist add-port br-floating brfl-brbm -- set Interface brfl-brbm type=patch options:peer=brbm-brfl
-      - ovs-vsctl --may-exist add-port brbm brbm-brfl -- set Interface brbm-brfl type=patch options:peer=brfl-brbm
-    - unless: (ovs-vsctl show |grep -q "Port brfl-brbm") && (ovs-vsctl show |grep -q "Port brbm-brfl")
-
 default_pool:
   cmd.run:
     - name: virsh pool-define-as --name default dir --target /var/lib/libvirt/images && virsh pool-autostart default && virsh pool-start default
@@ -130,7 +101,7 @@
 {{ node.name }}_tap{{ loop.index }}_in_ovs:
   openvswitch_port.present:
     - name: tap-{{ node.name }}i{{ loop.index }}
-    - bridge: brbm
+    - bridge: br-simulator
 
 {{ node.name }}_port{{ loop.index }}_present:
   ironicng.port_present:
diff --git a/metadata/service/simulator.yml b/metadata/service/simulator.yml
index 7a94209..1526413 100644
--- a/metadata/service/simulator.yml
+++ b/metadata/service/simulator.yml
@@ -4,15 +4,13 @@
   baremetal_simulator:
     enabled: true
     http_root: /var/www/httproot
-    brbm_net:
-      ip: 192.168.90.1
-      prefix: 24
     deploy_ramdisk_file: tinyipa-stable-newton.gz
     deploy_kernel_file: tinyipa-stable-newton.vmlinuz
     deploy_ramdisk_ref: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/${baremetal_simulator:deploy_ramdisk_file}
     deploy_kernel_ref: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/${baremetal_simulator:deploy_kernel_file}
     cirros_image_name: cirros-0.3.5-x86_64-disk.img
     cirros_image_ref: http://download.cirros-cloud.net/0.3.5/${baremetal_simulator:cirros_image_name}
+    cirros_image_checksum: f8ab98ff5e73ebab884d80c9dc9c7290
     nodes:
       admin_identity:
         - name: n0
@@ -61,3 +59,36 @@
             deploy_kernel: http://${_param:single_address}/${baremetal_simulator:deploy_kernel_file}
           ports:
             - address: aa:bb:cc:dd:02:00
+  ironic:
+    client:
+      deployment_profiles:
+        infra:
+          instance_info:
+            image_source: http://${_param:single_address}/${baremetal_simulator:cirros_image_name}
+            image_checksum: ${baremetal_simulator:cirros_image_checksum}
+            root_gb: 10
+          metadata:
+            instance:
+              domainname: local
+              public_keys:
+                key0: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+          network:
+            name: baremetal-flat-network
+  linux:
+    network:
+      interface:
+        br-simulator:
+          enabled: true
+          type: ovs_bridge
+        brsm-brbm:
+          enabled: true
+          type: ovs_port
+          port_type: patch
+          bridge: br-simulator
+          peer: brbm-brsm
+        brbm-brsm:
+          enabled: true
+          type: ovs_port
+          port_type: patch
+          bridge: br-baremetal
+          peer: brsm-brbm