diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh
index 62d323d7..9c0464bc 100755
--- a/labs/scripts/setup_neutron_controller.sh
+++ b/labs/scripts/setup_neutron_controller.sh
@@ -120,9 +120,9 @@ conf=/etc/nova/nova.conf
 iniset_sudo $conf DEFAULT network_api_class nova.network.neutronv2.api.API
 iniset_sudo $conf DEFAULT neutron_url http://controller-mgmt:9696
 iniset_sudo $conf DEFAULT neutron_auth_strategy keystone
-iniset_sudo $conf DEFAULT neutron_admin_tenant_name service
-iniset_sudo $conf DEFAULT neutron_admin_username neutron
-iniset_sudo $conf DEFAULT neutron_admin_password NEUTRON_PASS
+iniset_sudo $conf DEFAULT neutron_admin_tenant_name "$SERVICE_TENANT_NAME"
+iniset_sudo $conf DEFAULT neutron_admin_username "$neutron_admin_user"
+iniset_sudo $conf DEFAULT neutron_admin_password "$neutron_admin_password"
 iniset_sudo $conf DEFAULT neutron_admin_auth_url http://controller-mgmt:35357/v2.0
 iniset_sudo $conf DEFAULT linuxnet_interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
 iniset_sudo $conf DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver