diff --git a/tools/deployment/ceph/ceph-adapter-rook.sh b/tools/deployment/ceph/ceph-adapter-rook.sh
index 874d1c19c..530fd123e 100755
--- a/tools/deployment/ceph/ceph-adapter-rook.sh
+++ b/tools/deployment/ceph/ceph-adapter-rook.sh
@@ -33,7 +33,7 @@ helm upgrade --install ceph-adapter-rook ./ceph-adapter-rook \
   --values=/tmp/ceph-adapter-rook-ceph.yaml
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh ceph
+helm osh wait-for-pods ceph
 
 tee > /tmp/ceph-adapter-rook-openstack.yaml <<EOF
 manifests:
@@ -51,4 +51,4 @@ helm upgrade --install ceph-adapter-rook ./ceph-adapter-rook \
   --values=/tmp/ceph-adapter-rook-openstack.yaml
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
+helm osh wait-for-pods openstack
diff --git a/tools/deployment/ceph/ceph-rook.sh b/tools/deployment/ceph/ceph-rook.sh
index 18a92051e..c7564f119 100755
--- a/tools/deployment/ceph/ceph-rook.sh
+++ b/tools/deployment/ceph/ceph-rook.sh
@@ -350,7 +350,7 @@ EOF
 
 helm repo add rook-release https://charts.rook.io/release
 helm install --create-namespace --namespace rook-ceph rook-ceph rook-release/rook-ceph --version ${ROOK_RELEASE} -f /tmp/rook.yaml
-./tools/deployment/common/wait-for-pods.sh rook-ceph
+helm osh wait-for-pods rook-ceph
 
 tee /tmp/ceph.yaml <<EOF
 operatorNamespace: rook-ceph
@@ -649,7 +649,7 @@ do
     --selector="app=rook-ceph-rgw" \
     --no-headers | awk '{print $1; exit}')
 done
-./tools/deployment/common/wait-for-pods.sh ceph
+helm osh wait-for-pods ceph
 
 #NOTE: Validate deploy
 TOOLS_POD=$(kubectl get pods \
diff --git a/tools/deployment/ceph/ceph.sh b/tools/deployment/ceph/ceph.sh
index ba6f5cd67..c3343af2c 100755
--- a/tools/deployment/ceph/ceph.sh
+++ b/tools/deployment/ceph/ceph.sh
@@ -16,11 +16,8 @@ set -xe
 
 : ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
 : ${POD_NETWORK_CIDR:="10.244.0.0/24"}
-
-#NOTE: Lint and package chart
-for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
-  make "${CHART}"
-done
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 
 NUMBER_OF_OSDS="$(kubectl get nodes -l ceph-osd=enabled --no-headers | wc -l)"
 
@@ -203,14 +200,14 @@ manifests:
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
-  helm upgrade --install ${CHART} ./${CHART} \
+  helm upgrade --install ${CHART} ${OSH_INFRA_HELM_REPO}/${CHART} \
     --namespace=ceph \
     --values=/tmp/ceph.yaml \
     ${OSH_INFRA_EXTRA_HELM_ARGS} \
-    ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(./tools/deployment/common/get-values-overrides.sh ${CHART})}
+    ${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c ${CHART} ${FEATURES})}
 
   #NOTE: Wait for deploy
-  ./tools/deployment/common/wait-for-pods.sh ceph
+  helm osh wait-for-pods ceph
 
   #NOTE: Validate deploy
   MON_POD=$(kubectl get pods \
diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index 83f421ea0..833b66bdd 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -14,17 +14,16 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_MEMCACHED:="$(./tools/deployment/common/get-values-overrides.sh memcached)"}
-
-#NOTE: Lint and package chart
-make memcached
+#NOTE: Define variables
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_MEMCACHED:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c memcached ${FEATURES})"}
 
 #NOTE: Deploy command
-: ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install memcached ./memcached \
+helm upgrade --install memcached ${OSH_INFRA_HELM_REPO}/memcached \
     --namespace=openstack \
     ${OSH_INFRA_EXTRA_HELM_ARGS} \
     ${OSH_INFRA_EXTRA_HELM_ARGS_MEMCACHED}
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
+helm osh wait-for-pods openstack
diff --git a/tools/deployment/common/rabbitmq.sh b/tools/deployment/common/rabbitmq.sh
index 862695d37..2e31c09d0 100755
--- a/tools/deployment/common/rabbitmq.sh
+++ b/tools/deployment/common/rabbitmq.sh
@@ -14,22 +14,21 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ:="$(./tools/deployment/common/get-values-overrides.sh rabbitmq)"}
-
-#NOTE: Lint and package chart
-make rabbitmq
+#NOTE: Define variables
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_INFRA_PATH} -c rabbitmq ${FEATURES})"}
 
 #NOTE: Deploy command
-: ${OSH_EXTRA_HELM_ARGS:=""}
-helm upgrade --install rabbitmq ./rabbitmq \
+helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
     --namespace=openstack \
-    --recreate-pods \
-    --force \
-    --set network.management.ingress.classes.namespace=nginx \
+    --set volume.enabled=false \
+    --set pod.replicas.server=1 \
+    --timeout=600s \
     ${OSH_INFRA_EXTRA_HELM_ARGS} \
     ${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ}
 
 #NOTE: Wait for deploy
-./tools/deployment/common/wait-for-pods.sh openstack
+helm osh wait-for-pods openstack
 
 helm test rabbitmq --namespace openstack