diff --git a/tools/deployment/005-calicoctl-utility.sh b/tools/deployment/005-calicoctl-utility.sh
index 03924c41..ad186fe5 100755
--- a/tools/deployment/005-calicoctl-utility.sh
+++ b/tools/deployment/005-calicoctl-utility.sh
@@ -15,7 +15,7 @@ set -xe
 namespace=utility
 
 export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
-: ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY:="$(./tools/deployment/get-values-overrides.sh calicoctl-utility)"}
+: ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY:="$(helm osh get-values-overrides calicoctl-utility)"}
 
 helm upgrade --install calicoctl-utility ./artifacts/calicoctl-utility.tgz --namespace=$namespace \
     ${PORTHOLE_EXTRA_HELM_ARGS_CALICOCTL_UTILITY}
@@ -23,4 +23,4 @@ helm upgrade --install calicoctl-utility ./artifacts/calicoctl-utility.tgz --nam
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
\ No newline at end of file
+helm osh wait-for-pods $namespace
\ No newline at end of file
diff --git a/tools/deployment/010-ceph-utility.sh b/tools/deployment/010-ceph-utility.sh
index 77093764..e4df1b45 100755
--- a/tools/deployment/010-ceph-utility.sh
+++ b/tools/deployment/010-ceph-utility.sh
@@ -54,7 +54,7 @@ helm upgrade --install ceph-utility-config ./ceph-provisioners \
   --namespace=$namespace \
   --values=/tmp/ceph-utility-config.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
-  ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(./tools/deployment/common/get-values-overrides.sh  ceph-provisioners)} \
+  ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(helm osh get-values-overrides  ceph-provisioners)} \
   ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
 
 # Deploy Ceph-Utility
@@ -69,4 +69,4 @@ helm upgrade --install ceph-utility ./artifacts/ceph-utility.tgz --namespace=$na
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
+helm osh wait-for-pods $namespace
diff --git a/tools/deployment/020-compute-utility.sh b/tools/deployment/020-compute-utility.sh
index b46d3d73..8308c0a8 100755
--- a/tools/deployment/020-compute-utility.sh
+++ b/tools/deployment/020-compute-utility.sh
@@ -25,4 +25,4 @@ helm upgrade --install compute-utility ./artifacts/compute-utility.tgz --namespa
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
\ No newline at end of file
+helm osh wait-for-pods $namespace
\ No newline at end of file
diff --git a/tools/deployment/030-etcdctl-utility.sh b/tools/deployment/030-etcdctl-utility.sh
index ce820cd7..abc69171 100755
--- a/tools/deployment/030-etcdctl-utility.sh
+++ b/tools/deployment/030-etcdctl-utility.sh
@@ -24,4 +24,4 @@ helm upgrade --install etcdctl-utility ./artifacts/etcdctl-utility.tgz --namespa
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
\ No newline at end of file
+helm osh wait-for-pods $namespace
\ No newline at end of file
diff --git a/tools/deployment/040-mysqlclient-utility.sh b/tools/deployment/040-mysqlclient-utility.sh
index aee5129a..51a752c0 100755
--- a/tools/deployment/040-mysqlclient-utility.sh
+++ b/tools/deployment/040-mysqlclient-utility.sh
@@ -32,7 +32,7 @@ manifests:
 EOF
 
 export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
-: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(./tools/deployment/common/get-values-overrides.sh mariadb)"}
+: ${OSH_EXTRA_HELM_ARGS_MARIADB:="$(helm osh get-values-overrides mariadb)"}
 
 #NOTE: Lint and package chart
 make -C "${HELM_CHART_ROOT_PATH}" mariadb
@@ -47,7 +47,7 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
     ${OSH_EXTRA_HELM_ARGS_MARIADB}
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
+helm osh wait-for-pods openstack
 
 # Deploy mysqlclient-utility
 cd "${CURRENT_DIR}"
@@ -64,4 +64,4 @@ helm upgrade --install mysqlclient-utility ./artifacts/mysqlclient-utility.tgz -
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
+helm osh wait-for-pods $namespace
diff --git a/tools/deployment/050-openstack-utility.sh b/tools/deployment/050-openstack-utility.sh
index e8e699e4..88cf0c61 100755
--- a/tools/deployment/050-openstack-utility.sh
+++ b/tools/deployment/050-openstack-utility.sh
@@ -23,4 +23,4 @@ helm upgrade --install openstack-utility ./artifacts/openstack-utility.tgz --nam
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
+helm osh wait-for-pods $namespace
diff --git a/tools/deployment/060-postgresql-utility.sh b/tools/deployment/060-postgresql-utility.sh
index f249da0b..1ac19537 100755
--- a/tools/deployment/060-postgresql-utility.sh
+++ b/tools/deployment/060-postgresql-utility.sh
@@ -24,7 +24,7 @@ make postgresql
 
 #NOTE: Deploy command
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
-: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(./tools/deployment/common/get-values-overrides.sh postgresql)"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides postgresql)"}
 
 helm upgrade --install postgresql ./postgresql \
     --namespace=osh-infra \
@@ -36,7 +36,7 @@ helm upgrade --install postgresql ./postgresql \
     ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL}
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh osh-infra
+helm osh wait-for-pods osh-infra
 
 bash -c "./tools/deployment/common/ingress.sh"
 # Deploy postgresql-utility
@@ -55,4 +55,4 @@ helm upgrade --install postgresql-utility ./artifacts/postgresql-utility.tgz --n
 # Wait for Deployment
 : "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
 cd "${OSH_INFRA_PATH}"
-./tools/deployment/common/wait-for-pods.sh $namespace
+helm osh wait-for-pods $namespace