diff --git a/tools/deployment/keystone-auth/010-setup-client.sh b/tools/deployment/keystone-auth/010-setup-client.sh
index 51cdfbd05..1a390140d 100755
--- a/tools/deployment/keystone-auth/010-setup-client.sh
+++ b/tools/deployment/keystone-auth/010-setup-client.sh
@@ -17,4 +17,4 @@
 set -xe
 
 #NOTE: Move into openstack-helm root dir & Run client setup script
-cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/020-setup-client.sh
+cd ${OSH_PATH:-"../openstack-helm/"}; ./tools/deployment/developer/nfs/020-setup-client.sh; cd -
diff --git a/tools/deployment/keystone-auth/070-keystone.sh b/tools/deployment/keystone-auth/070-keystone.sh
index 5b57f0b8a..927fb3565 100755
--- a/tools/deployment/keystone-auth/070-keystone.sh
+++ b/tools/deployment/keystone-auth/070-keystone.sh
@@ -31,7 +31,7 @@ helm upgrade --install ldap ${OSH_INFRA_PATH}/ldap \
 helm status ldap
 
 # Install Keystone
-cd "${OSH_PATH}"
+cd ${OSH_PATH:-"../openstack-helm/"}
 
 make pull-images keystone
 : ${OSH_EXTRA_HELM_ARGS:=""}