diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh
index fe8dc3bb..530a19ae 100755
--- a/labs/scripts/setup_neutron_controller.sh
+++ b/labs/scripts/setup_neutron_controller.sh
@@ -52,7 +52,8 @@ keystone user-role-add \
 echo "Configuring neutron to use keystone for authentication."
 echo "Configuring neutron.conf"
 conf=/etc/neutron/neutron.conf
-service_tenant_id=$(keystone tenant-get service | awk '/ id / {print $2}')
+service_tenant_id=$(keystone tenant-get "$SERVICE_TENANT_NAME" | awk '/ id / {print $4}')
+echo "Service tenant id: $service_tenant_id"
 
 # Configuring [DEFAULT] section
 iniset_sudo $conf DEFAULT auth_strategy keystone