diff --git a/labs/scripts/setup_neutron_network.sh b/labs/scripts/setup_neutron_network.sh
index 2e24393d..464b05be 100755
--- a/labs/scripts/setup_neutron_network.sh
+++ b/labs/scripts/setup_neutron_network.sh
@@ -117,7 +117,7 @@ iniset_sudo $conf DEFAULT auth_region regionOne
 iniset_sudo $conf DEFAULT admin_tenant_name "$SERVICE_TENANT_NAME"
 iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user"
 iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password"
-iniset_sudo $conf DEFAULT nova_metadata_ip controller-mgmt
+iniset_sudo $conf DEFAULT nova_metadata_ip "$(hostname_to_ip controller-mgmt)"
 iniset_sudo $conf DEFAULT metadata_proxy_shared_secret "$METADATA_SECRET"
 
 echo "Configuring the DHCP agent"
diff --git a/labs/scripts/setup_nova_compute.sh b/labs/scripts/setup_nova_compute.sh
index a98143ad..2a2493ec 100755
--- a/labs/scripts/setup_nova_compute.sh
+++ b/labs/scripts/setup_nova_compute.sh
@@ -54,7 +54,7 @@ iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
 iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
 
 # Configure other variables
-iniset_sudo $conf DEFAULT my_ip compute-mgmt
+iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip compute-mgmt)"
 iniset_sudo $conf DEFAULT vncserver_listen 0.0.0.0
 iniset_sudo $conf DEFAULT vnc_enabled True
 iniset_sudo $conf DEFAULT vncserver_proxyclient_address compute-mgmt
diff --git a/labs/scripts/setup_nova_controller.sh b/labs/scripts/setup_nova_controller.sh
index 234d9a0d..35bb0217 100755
--- a/labs/scripts/setup_nova_controller.sh
+++ b/labs/scripts/setup_nova_controller.sh
@@ -62,7 +62,7 @@ iniset_sudo $conf DEFAULT rabbit_host controller-mgmt
 iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
 
 # Configure other variables
-iniset_sudo $conf DEFAULT my_ip controller-mgmt
+iniset_sudo $conf DEFAULT my_ip "$(hostname_to_ip controller-mgmt)"
 iniset_sudo $conf DEFAULT vncserver_listen controller-mgmt
 iniset_sudo $conf DEFAULT vncserver_proxyclient_address controller-mgmt
 iniset_sudo $conf DEFAULT auth_strategy keystone