diff --git a/files/setup.sh b/files/setup.sh
index 1b0ccc1..ae70236 100644
--- a/files/setup.sh
+++ b/files/setup.sh
@@ -19,10 +19,10 @@ if [[ $? -ne 0 ]]; then
     nova flavor-create m1.micro 84 128 0 1
 fi
 
-keystone user-role-add --user admin --role admin --tenant services
-OS_TENANT_NAME=services neutron net-create floating001 --router:external True --provider:physical_network external --provider:network_type flat
+openstack role add admin --project services --user admin
+OS_TENANT_NAME=services neutron net-create floating001 --router:external --provider:physical_network external --provider:network_type flat
 OS_TENANT_NAME=services neutron subnet-create floating001 --name floating001 --allocation-pool start=203.0.113.100,end=203.0.113.200 --disable-dhcp --gateway 203.0.113.1 203.0.113.0/24
-keystone user-role-remove --user admin --role admin --tenant services
+openstack role remove admin --project services --user admin
 
 neutron net-create internal001
 neutron subnet-create --name internal001 internal001 192.168.200.0/24