diff --git a/metadata/service/nodes_flat.yml b/metadata/service/nodes_flat.yml
index bcfb989..3d4d284 100644
--- a/metadata/service/nodes_flat.yml
+++ b/metadata/service/nodes_flat.yml
@@ -21,7 +21,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}
@@ -45,7 +45,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}
@@ -73,7 +73,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 3b92d52..b2f55e9 100644
--- a/metadata/service/nodes_neutron.yml
+++ b/metadata/service/nodes_neutron.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}
@@ -55,7 +55,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}
@@ -89,7 +89,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}