diff --git a/metadata/service/nodes_flat.yml b/metadata/service/nodes_flat.yml
index 9ede4c3..e65b804 100644
--- a/metadata/service/nodes_flat.yml
+++ b/metadata/service/nodes_flat.yml
@@ -20,7 +20,7 @@
             driver_info:
               ipmi_username: admin
               ipmi_password: password
-              ipmi_address: ${_param:single_address}
+              ipmi_address: ${_param:single_baremetal_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}
@@ -44,7 +44,7 @@
             driver_info:
               ipmi_username: admin
               ipmi_password: password
-              ipmi_address: ${_param:single_address}
+              ipmi_address: ${_param:single_baremetal_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}
@@ -72,7 +72,7 @@
             driver_info:
               ipmi_username: admin
               ipmi_password: password
-              ipmi_address: ${_param:single_address}
+              ipmi_address: ${_param:single_baremetal_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}
diff --git a/metadata/service/nodes_neutron.yml b/metadata/service/nodes_neutron.yml
index e6f1966..b3d5597 100644
--- a/metadata/service/nodes_neutron.yml
+++ b/metadata/service/nodes_neutron.yml
@@ -19,7 +19,7 @@
             driver_info:
               ipmi_username: admin
               ipmi_password: password
-              ipmi_address: ${_param:single_address}
+              ipmi_address: ${_param:single_baremetal_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}
@@ -54,7 +54,7 @@
             driver_info:
               ipmi_username: admin
               ipmi_password: password
-              ipmi_address: ${_param:single_address}
+              ipmi_address: ${_param:single_baremetal_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}
@@ -88,7 +88,7 @@
             driver_info:
               ipmi_username: admin
               ipmi_password: password
-              ipmi_address: ${_param:single_address}
+              ipmi_address: ${_param:single_baremetal_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}