diff --git a/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup b/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
index 08dc06134..60cec2641 100755
--- a/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
+++ b/elements/undercloud-post-config/os-refresh-config/post-configure.d/98-undercloud-setup
@@ -59,15 +59,15 @@ ENDPOINT_LIST="--glance-password $UNDERCLOUD_GLANCE_PASSWORD
 REGISTER_SERVICE_OPTS=
 
 # Needed by ceilometer user in register-endpoint
-if ! keystone role-get ResellerAdmin; then
-    keystone role-create --name=ResellerAdmin
+if ! openstack role show ResellerAdmin; then
+    openstack role create ResellerAdmin
 fi
 
 # TODO: this needs to be switched over to use os-cloud-config's setup-endpoints
 tripleo setup-endpoints $UNDERCLOUD_IP $ENDPOINT_LIST $REGISTER_SERVICE_OPTS
 
-if ! keystone role-get heat_stack_user; then
-    keystone role-create --name heat_stack_user
+if ! openstack role show heat_stack_user; then
+    openstack role create heat_stack_user
 fi
 
 DHCP_START=$(os-apply-config --key neutron.dhcp_start --type netaddress)
@@ -102,7 +102,7 @@ for flavor in m1.tiny m1.small m1.medium m1.large m1.xlarge; do
 done
 
 # Disable nova quotas
-nova quota-update --cores -1 --instances -1 --ram -1 $(keystone tenant-get admin | awk '$2=="id" {print $4}')
+nova quota-update --cores -1 --instances -1 --ram -1 $(openstack project show admin | awk '$2=="id" {print $4}')
 
 # instack-prepare-for-overcloud
 rm -rf $HOME/.novaclient
diff --git a/scripts/instack-deploy-overcloud b/scripts/instack-deploy-overcloud
index 25318f00b..6087f1a9f 100755
--- a/scripts/instack-deploy-overcloud
+++ b/scripts/instack-deploy-overcloud
@@ -420,8 +420,8 @@ ${SSLBASE:+-s $PUBLIC_API_URL}
 # REGISTER_SERVICE_OPTS="--ceilometer-password $OVERCLOUD_CEILOMETER_PASSWORD "
 REGISTER_SERVICE_OPTS=""
 
-keystone role-create --name=swiftoperator
-keystone role-create --name=ResellerAdmin
+openstack role create swiftoperator
+openstack role create ResellerAdmin
 
 tripleo setup-endpoints $OVERCLOUD_IP \
     --cinder-password $OVERCLOUD_CINDER_PASSWORD \
@@ -432,7 +432,7 @@ tripleo setup-endpoints $OVERCLOUD_IP \
     --swift-password $OVERCLOUD_SWIFT_PASSWORD \
     $REGISTER_SERVICE_OPTS \
     ${SSLBASE:+--ssl $PUBLIC_API_URL}
-keystone role-create --name heat_stack_user
+openstack role create heat_stack_user
 # setup-neutron "" "" 10.0.0.0/8 "" "" "" "" 192.0.2.45 192.0.2.64 192.0.2.0/24
 NETWORK_CIDR=${NETWORK_CIDR:-"10.0.0.0/8"}
 FLOATING_IP_START=${FLOATING_IP_START:-"192.0.2.45"}
diff --git a/scripts/instack-ironic-deployment b/scripts/instack-ironic-deployment
index bc7817055..6cec02f36 100755
--- a/scripts/instack-ironic-deployment
+++ b/scripts/instack-ironic-deployment
@@ -72,7 +72,7 @@ STDERR=/dev/null
 export PYTHONWARNINGS="ignore"
 
 DEPLOY_NAME=${DEPLOY_NAME:-"ironic-discover"}
-IRONIC=$(keystone endpoint-get --service baremetal | grep publicURL | awk '{ print $4; }')
+IRONIC=$(openstack endpoint show baremetal | grep publicurl | awk '{ print $4; }')
 IRONIC=${IRONIC%/}
 
 while true ; do
@@ -308,7 +308,7 @@ function setup_flavors {
 
 function show_profile {
     node_ids=$(ironic node-list | tail -n +4 | head -n -1 | awk -F "| " '{print $2}')
-    token=$(keystone token-get | grep ' id ' | awk '{print $4}')
+    token=$(openstack token issue | grep ' id ' | awk '{print $4}')
     echo "  Querying assigned profiles ... "
     echo
     for node_id in $node_ids; do
@@ -328,7 +328,7 @@ function wait_for_hypervisor_stats {
     expected_memory=0
     expected_vcpus=0
 
-    token=$(keystone token-get | grep ' id ' | awk '{print $4}')
+    token=$(openstack token issue | grep ' id ' | awk '{print $4}')
     echo -n "  Wating for nova hypervisor stats ... "
     for node_id in $node_ids; do
         mem=$(curl -s -H "x-auth-token: $token" $IRONIC/v1/nodes/$node_id | jq '.properties.memory_mb | tonumber')