diff --git a/tools/deployment/ceph/ceph-radosgw.sh b/tools/deployment/ceph/ceph-radosgw.sh
index 6a23bc82b..a4358fc4f 100755
--- a/tools/deployment/ceph/ceph-radosgw.sh
+++ b/tools/deployment/ceph/ceph-radosgw.sh
@@ -14,7 +14,9 @@
 
 set -xe
 
-: ${OSH_EXTRA_HELM_ARGS_CEPH_RGW:="$(helm osh get-values-overrides -c ceph-rgw ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_EXTRA_HELM_ARGS_CEPH_RGW:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c ceph-rgw ${FEATURES})"}
 
 #NOTE: Deploy command
 tee /tmp/radosgw-osh-infra.yaml <<EOF
@@ -46,7 +48,7 @@ manifests:
   job_bootstrap: true
 EOF
 
-helm upgrade --install radosgw-osh-infra ./ceph-rgw \
+helm upgrade --install radosgw-osh-infra ${OSH_INFRA_HELM_REPO}/ceph-rgw \
   --namespace=osh-infra \
   --values=/tmp/radosgw-osh-infra.yaml \
   ${OSH_EXTRA_HELM_ARGS:=} \
diff --git a/tools/deployment/common/daemonjob-controller.sh b/tools/deployment/common/daemonjob-controller.sh
index 4c64852d6..da477ebe6 100755
--- a/tools/deployment/common/daemonjob-controller.sh
+++ b/tools/deployment/common/daemonjob-controller.sh
@@ -14,10 +14,12 @@
 set -xe
 
 namespace="metacontroller"
-: ${HELM_ARGS_DAEMONJOB_CONTROLLER:="$(helm osh get-values-overrides -c daemonjob-controller ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${HELM_ARGS_DAEMONJOB_CONTROLLER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c daemonjob-controller ${FEATURES})"}
 
 #NOTE: Deploy command
-helm upgrade --install daemonjob-controller ./daemonjob-controller \
+helm upgrade --install daemonjob-controller ${OSH_INFRA_HELM_REPO}/daemonjob-controller \
     --namespace=$namespace \
     --set pod.replicas.daemonjob_controller=4 \
     ${HELM_ARGS_DAEMONJOB_CONTROLLER}
diff --git a/tools/deployment/common/deploy-docker-registry.sh b/tools/deployment/common/deploy-docker-registry.sh
index 11d602799..2cb5f98e1 100755
--- a/tools/deployment/common/deploy-docker-registry.sh
+++ b/tools/deployment/common/deploy-docker-registry.sh
@@ -14,6 +14,8 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 for NAMESPACE in docker-nfs docker-registry; do
 tee /tmp/${NAMESPACE}-ns.yaml << EOF
 apiVersion: v1
@@ -37,11 +39,11 @@ storageclass:
   name: openstack-helm-bootstrap
 EOF
 helm upgrade --install docker-registry-nfs-provisioner \
-    ./nfs-provisioner --namespace=docker-nfs \
+    ${OSH_INFRA_HELM_REPO}/nfs-provisioner --namespace=docker-nfs \
     --values=/tmp/docker-registry-nfs-provisioner.yaml
 
 #NOTE: Deploy redis for the docker registry
-helm upgrade --install docker-registry-redis ./redis \
+helm upgrade --install docker-registry-redis ${OSH_INFRA_HELM_REPO}/redis \
     --namespace=docker-registry \
     --set labels.node_selector_key=openstack-helm-node-class \
     --set labels.node_selector_value=primary
@@ -54,7 +56,7 @@ labels:
 volume:
   class_name: openstack-helm-bootstrap
 EOF
-helm upgrade --install docker-registry ./registry \
+helm upgrade --install docker-registry ${OSH_INFRA_HELM_REPO}/registry \
     --namespace=docker-registry \
     --values=/tmp/docker-registry.yaml
 
diff --git a/tools/deployment/common/falco.sh b/tools/deployment/common/falco.sh
index d60fbabc8..8ed9ad025 100755
--- a/tools/deployment/common/falco.sh
+++ b/tools/deployment/common/falco.sh
@@ -14,8 +14,10 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 #NOTE: Deploy command
-helm upgrade --install falco ./falco \
+helm upgrade --install falco ${OSH_INFRA_HELM_REPO}/falco \
     --namespace=kube-system
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/common/ldap.sh b/tools/deployment/common/ldap.sh
index eaa66ad18..c3a883877 100755
--- a/tools/deployment/common/ldap.sh
+++ b/tools/deployment/common/ldap.sh
@@ -14,11 +14,13 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides -c ldap ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_LDAP:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c ldap ${FEATURES})"}
 : ${NAMESPACE:="osh-infra"}
 
 #NOTE: Deploy command
-helm upgrade --install ldap ./ldap \
+helm upgrade --install ldap ${OSH_INFRA_HELM_REPO}/ldap \
     --namespace=${NAMESPACE} \
     --set bootstrap.enabled=true \
     ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
diff --git a/tools/deployment/common/metacontroller.sh b/tools/deployment/common/metacontroller.sh
index 711991b46..b6ee8b196 100755
--- a/tools/deployment/common/metacontroller.sh
+++ b/tools/deployment/common/metacontroller.sh
@@ -14,7 +14,9 @@
 set -xe
 
 namespace="metacontroller"
-: ${HELM_ARGS_METACONTROLLER:="$(helm osh get-values-overrides -c metacontroller ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${HELM_ARGS_METACONTROLLER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c metacontroller ${FEATURES})"}
 
 #NOTE: Check no crd exists of APIGroup metacontroller.k8s.io
 crds=$(kubectl get crd | awk '/metacontroller.k8s.io/{print $1}')
@@ -36,7 +38,7 @@ EOF
 kubectl create -f /tmp/${namespace}-ns.yaml
 
 #NOTE: Deploy command
-helm upgrade --install metacontroller ./metacontroller \
+helm upgrade --install metacontroller ${OSH_INFRA_HELM_REPO}/metacontroller \
     --namespace=$namespace \
     --set pod.replicas.metacontroller=3 \
     ${HELM_ARGS_METACONTROLLER}
diff --git a/tools/deployment/common/namespace-config.sh b/tools/deployment/common/namespace-config.sh
index 15d9afde1..e4d5f7785 100755
--- a/tools/deployment/common/namespace-config.sh
+++ b/tools/deployment/common/namespace-config.sh
@@ -14,8 +14,10 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 #NOTE: Deploy namespace configs
 for NAMESPACE in kube-system ceph openstack; do
-  helm upgrade --install ${NAMESPACE}-namespace-config ./namespace-config \
+  helm upgrade --install ${NAMESPACE}-namespace-config ${OSH_INFRA_HELM_REPO}/namespace-config \
     --namespace=${NAMESPACE}
 done
diff --git a/tools/deployment/common/nfs-provisioner.sh b/tools/deployment/common/nfs-provisioner.sh
index a43830568..ad6b3e93c 100755
--- a/tools/deployment/common/nfs-provisioner.sh
+++ b/tools/deployment/common/nfs-provisioner.sh
@@ -14,6 +14,8 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 tee /tmp/nfs-ns.yaml << EOF
 apiVersion: v1
 kind: Namespace
@@ -35,7 +37,7 @@ storageclass:
   name: general
 EOF
 helm upgrade --install nfs-provisioner \
-    ./nfs-provisioner --namespace=nfs \
+    ${OSH_INFRA_HELM_REPO}/nfs-provisioner --namespace=nfs \
     --values=/tmp/nfs-provisioner.yaml
 
 #NOTE: Wait for deployment
diff --git a/tools/deployment/db/mariadb-backup.sh b/tools/deployment/db/mariadb-backup.sh
index 80775bbc8..8711e79d8 100755
--- a/tools/deployment/db/mariadb-backup.sh
+++ b/tools/deployment/db/mariadb-backup.sh
@@ -14,10 +14,12 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_BACKUP:="$(helm osh get-values-overrides -c mariadb-backup ${FEATURES})"}
 
 #NOTE: Deploy command
-helm upgrade --install mariadb-backup ./mariadb-backup \
+helm upgrade --install mariadb-backup ${OSH_INFRA_HELM_REPO}/mariadb-backup \
     --namespace=openstack \
     --wait \
     --timeout 900s \
diff --git a/tools/deployment/db/mariadb-operator-cluster.sh b/tools/deployment/db/mariadb-operator-cluster.sh
index bd1e54b12..ddd6eebad 100755
--- a/tools/deployment/db/mariadb-operator-cluster.sh
+++ b/tools/deployment/db/mariadb-operator-cluster.sh
@@ -24,12 +24,14 @@ helm upgrade --install mariadb-operator mariadb-operator/mariadb-operator --vers
 #NOTE: Wait for deploy
 helm osh wait-for-pods mariadb-operator
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_CLUSTER:="$(helm osh get-values-overrides -c mariadb-cluster ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_CLUSTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c mariadb-cluster ${FEATURES})"}
 
 #NOTE: Deploy command
 # Deploying downscaled cluster
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
-helm upgrade --install mariadb-cluster ./mariadb-cluster \
+helm upgrade --install mariadb-cluster ${OSH_INFRA_HELM_REPO}/mariadb-cluster \
     --namespace=openstack \
     --wait \
     --timeout 900s \
diff --git a/tools/deployment/db/mariadb.sh b/tools/deployment/db/mariadb.sh
index 08d0b7929..b09d46db9 100755
--- a/tools/deployment/db/mariadb.sh
+++ b/tools/deployment/db/mariadb.sh
@@ -21,7 +21,7 @@ set -xe
 : ${RUN_HELM_TESTS:="yes"}
 
 #NOTE: Deploy command
-helm upgrade --install mariadb ./mariadb \
+helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
     --namespace=${NAMESPACE} \
     ${MONITORING_HELM_ARGS:="--set monitoring.prometheus.enabled=true"} \
     ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
diff --git a/tools/deployment/db/postgresql.sh b/tools/deployment/db/postgresql.sh
index 0b156d8ba..c932e3903 100755
--- a/tools/deployment/db/postgresql.sh
+++ b/tools/deployment/db/postgresql.sh
@@ -15,10 +15,12 @@
 set -xe
 
 #NOTE: Deploy command
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 : ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
-: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides -c postgresql ${FEATURES})"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_POSTGRESQL:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c postgresql ${FEATURES})"}
 
-helm upgrade --install postgresql ./postgresql \
+helm upgrade --install postgresql ${OSH_INFRA_HELM_REPO}/postgresql \
     --namespace=osh-infra \
     --set monitoring.prometheus.enabled=true \
     --set storage.pvc.size=1Gi \
diff --git a/tools/deployment/logging/elasticsearch.sh b/tools/deployment/logging/elasticsearch.sh
index 29880b7ae..8fc359e58 100755
--- a/tools/deployment/logging/elasticsearch.sh
+++ b/tools/deployment/logging/elasticsearch.sh
@@ -173,9 +173,11 @@ images:
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
 EOF
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(helm osh get-values-overrides -c elasticsearch ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c elasticsearch ${FEATURES})"}
 
-helm upgrade --install elasticsearch ./elasticsearch \
+helm upgrade --install elasticsearch ${OSH_INFRA_HELM_REPO}/elasticsearch \
   --namespace=osh-infra \
   --values=/tmp/elasticsearch.yaml\
   ${OSH_INFRA_EXTRA_HELM_ARGS} \
diff --git a/tools/deployment/logging/fluentbit.sh b/tools/deployment/logging/fluentbit.sh
index deb36f737..aecd65d0a 100755
--- a/tools/deployment/logging/fluentbit.sh
+++ b/tools/deployment/logging/fluentbit.sh
@@ -14,9 +14,11 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT:="$(helm osh get-values-overrides -c fluentbit ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c fluentbit ${FEATURES})"}
 
-helm upgrade --install fluentbit ./fluentbit \
+helm upgrade --install fluentbit ${OSH_INFRA_HELM_REPO}/fluentbit \
   --namespace=osh-infra \
   ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
   ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTBIT}
diff --git a/tools/deployment/logging/fluentd.sh b/tools/deployment/logging/fluentd.sh
index 871ddbe0c..dc861ab08 100755
--- a/tools/deployment/logging/fluentd.sh
+++ b/tools/deployment/logging/fluentd.sh
@@ -14,7 +14,9 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTD:="$(helm osh get-values-overrides -c fluentd ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_FLUENTD:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c fluentd ${FEATURES})"}
 
 tee /tmp/fluentd.yaml << EOF
 pod:
@@ -224,7 +226,7 @@ conf:
           </match>
         </label>
 EOF
-helm upgrade --install fluentd ./fluentd \
+helm upgrade --install fluentd ${OSH_INFRA_HELM_REPO}/fluentd \
     --namespace=osh-infra \
     --values=/tmp/fluentd.yaml \
   ${OSH_INFRA_EXTRA_HELM_ARGS} \
diff --git a/tools/deployment/logging/kibana.sh b/tools/deployment/logging/kibana.sh
index 3e0e384d1..47f1ea4d4 100755
--- a/tools/deployment/logging/kibana.sh
+++ b/tools/deployment/logging/kibana.sh
@@ -14,10 +14,12 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_KIBANA:="$(helm osh get-values-overrides -c kibana ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_KIBANA:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c kibana ${FEATURES})"}
 
 #NOTE: Deploy command
-helm upgrade --install kibana ./kibana \
+helm upgrade --install kibana ${OSH_INFRA_HELM_REPO}/kibana \
   --namespace=osh-infra \
   --set network.kibana.ingress.classes.namespace=nginx-osh-infra \
   ${OSH_INFRA_EXTRA_HELM_ARGS} \
diff --git a/tools/deployment/monitoring/alertmanager.sh b/tools/deployment/monitoring/alertmanager.sh
index 02d3c61f3..e2cbc8db5 100755
--- a/tools/deployment/monitoring/alertmanager.sh
+++ b/tools/deployment/monitoring/alertmanager.sh
@@ -14,8 +14,10 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 #NOTE: Deploy command
-helm upgrade --install prometheus-alertmanager ./prometheus-alertmanager \
+helm upgrade --install prometheus-alertmanager ${OSH_INFRA_HELM_REPO}/prometheus-alertmanager \
     --namespace=osh-infra \
     --set pod.replicas.alertmanager=1
 
diff --git a/tools/deployment/monitoring/blackbox-exporter.sh b/tools/deployment/monitoring/blackbox-exporter.sh
index 97b17acb6..85fb496eb 100755
--- a/tools/deployment/monitoring/blackbox-exporter.sh
+++ b/tools/deployment/monitoring/blackbox-exporter.sh
@@ -14,9 +14,11 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 #NOTE: Deploy command
 helm upgrade --install prometheus-blackbox-exporter \
-    ./prometheus-blackbox-exporter --namespace=osh-infra
+    ${OSH_INFRA_HELM_REPO}/prometheus-blackbox-exporter --namespace=osh-infra
 
 #NOTE: Wait for deploy
 helm osh wait-for-pods osh-infra
diff --git a/tools/deployment/monitoring/grafana.sh b/tools/deployment/monitoring/grafana.sh
index 975f0acab..ac30ea467 100755
--- a/tools/deployment/monitoring/grafana.sh
+++ b/tools/deployment/monitoring/grafana.sh
@@ -14,11 +14,13 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 FEATURE_GATES="calico ceph containers coredns elasticsearch kubernetes nginx nodes openstack prometheus home_dashboard persistentvolume apparmor"
-: ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -c grafana ${FEATURE_GATES} ${FEATURES} 2>/dev/null)}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA:=$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c grafana ${FEATURE_GATES} ${FEATURES} 2>/dev/null)}
 
 #NOTE: Deploy command
-helm upgrade --install grafana ./grafana \
+helm upgrade --install grafana ${OSH_INFRA_HELM_REPO}/grafana \
   --namespace=osh-infra \
   ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
   ${OSH_INFRA_EXTRA_HELM_ARGS_GRAFANA}
diff --git a/tools/deployment/monitoring/kube-state-metrics.sh b/tools/deployment/monitoring/kube-state-metrics.sh
index 411cf1e86..132588d27 100755
--- a/tools/deployment/monitoring/kube-state-metrics.sh
+++ b/tools/deployment/monitoring/kube-state-metrics.sh
@@ -14,11 +14,13 @@
 
 set -xe
 
-#NOTE: Deploy command
-: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS:="$(helm osh get-values-overrides -c prometheus-kube-state-metrics ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-kube-state-metrics ${FEATURES})"}
 
+#NOTE: Deploy command
 helm upgrade --install prometheus-kube-state-metrics \
-    ./prometheus-kube-state-metrics --namespace=kube-system \
+    ${OSH_INFRA_HELM_REPO}/prometheus-kube-state-metrics --namespace=kube-system \
     ${OSH_INFRA_EXTRA_HELM_ARGS_KUBE_STATE_METRICS}
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/monitoring/mysql-exporter.sh b/tools/deployment/monitoring/mysql-exporter.sh
index 3f63bf998..079539409 100755
--- a/tools/deployment/monitoring/mysql-exporter.sh
+++ b/tools/deployment/monitoring/mysql-exporter.sh
@@ -14,10 +14,12 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_MYSQL_EXPORTER:="$(helm osh get-values-overrides -c prometheus-mysql-exporter ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_MARIADB_MYSQL_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-mysql-exporter ${FEATURES})"}
 
 #NOTE: Deploy command
-helm upgrade --install prometheus-mysql-exporter ./prometheus-mysql-exporter \
+helm upgrade --install prometheus-mysql-exporter ${OSH_INFRA_HELM_REPO}/prometheus-mysql-exporter \
     --namespace=openstack \
     --wait \
     --timeout 900s \
diff --git a/tools/deployment/monitoring/nagios.sh b/tools/deployment/monitoring/nagios.sh
index 444339d8f..06ddbcd7a 100755
--- a/tools/deployment/monitoring/nagios.sh
+++ b/tools/deployment/monitoring/nagios.sh
@@ -14,10 +14,12 @@
 
 set -xe
 
-: ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS:="$(helm osh get-values-overrides -c nagios ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c nagios ${FEATURES})"}
 
 #NOTE: Deploy command
-helm upgrade --install nagios ./nagios \
+helm upgrade --install nagios ${OSH_INFRA_HELM_REPO}/nagios \
   --namespace=osh-infra \
   ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
   ${OSH_INFRA_EXTRA_HELM_ARGS_NAGIOS}
diff --git a/tools/deployment/monitoring/node-exporter.sh b/tools/deployment/monitoring/node-exporter.sh
index 6657b1bf7..6d2c3a542 100755
--- a/tools/deployment/monitoring/node-exporter.sh
+++ b/tools/deployment/monitoring/node-exporter.sh
@@ -14,11 +14,13 @@
 
 set -xe
 
-#NOTE: Deploy command
-: ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER:="$(helm osh get-values-overrides -c prometheus-node-exporter ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-node-exporter ${FEATURES})"}
 
+#NOTE: Deploy command
 helm upgrade --install prometheus-node-exporter \
-    ./prometheus-node-exporter --namespace=kube-system \
+    ${OSH_INFRA_HELM_REPO}/prometheus-node-exporter --namespace=kube-system \
     ${OSH_INFRA_EXTRA_HELM_ARGS_NODE_EXPORTER}
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/monitoring/node-problem-detector.sh b/tools/deployment/monitoring/node-problem-detector.sh
index 7799d7e18..6dc08a4f3 100755
--- a/tools/deployment/monitoring/node-problem-detector.sh
+++ b/tools/deployment/monitoring/node-problem-detector.sh
@@ -13,6 +13,8 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+
 #NOTE: Deploy command
 tee /tmp/kubernetes-node-problem-detector.yaml << EOF
 monitoring:
@@ -25,7 +27,7 @@ manifests:
   service: true
 EOF
 helm upgrade --install kubernetes-node-problem-detector \
-    ./kubernetes-node-problem-detector --namespace=kube-system \
+    ${OSH_INFRA_HELM_REPO}/kubernetes-node-problem-detector --namespace=kube-system \
     --values=/tmp/kubernetes-node-problem-detector.yaml
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/monitoring/openstack-exporter.sh b/tools/deployment/monitoring/openstack-exporter.sh
index 0c57c3cfd..a95893a96 100755
--- a/tools/deployment/monitoring/openstack-exporter.sh
+++ b/tools/deployment/monitoring/openstack-exporter.sh
@@ -14,8 +14,9 @@
 
 set -xe
 
-#NOTE: Deploy command
-: ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER:="$(helm osh get-values-overrides -c prometheus-openstack-exporter ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-openstack-exporter ${FEATURES})"}
 
 tee /tmp/prometheus-openstack-exporter.yaml << EOF
 manifests:
@@ -27,8 +28,9 @@ dependencies:
       services: null
 EOF
 
+#NOTE: Deploy command
 helm upgrade --install prometheus-openstack-exporter \
-    ./prometheus-openstack-exporter \
+    ${OSH_INFRA_HELM_REPO}/prometheus-openstack-exporter \
     --namespace=openstack \
     --values=/tmp/prometheus-openstack-exporter.yaml \
     ${OSH_INFRA_EXTRA_HELM_ARGS_OS_EXPORTER}
diff --git a/tools/deployment/monitoring/process-exporter.sh b/tools/deployment/monitoring/process-exporter.sh
index a78820847..ae71ecd8c 100755
--- a/tools/deployment/monitoring/process-exporter.sh
+++ b/tools/deployment/monitoring/process-exporter.sh
@@ -14,11 +14,13 @@
 
 set -xe
 
-#NOTE: Deploy command
-: ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER:="$(helm osh get-values-overrides -c prometheus-process-exporter ${FEATURES})"}
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus-process-exporter ${FEATURES})"}
 
+#NOTE: Deploy command
 helm upgrade --install prometheus-process-exporter \
-    ./prometheus-process-exporter --namespace=kube-system \
+    ${OSH_INFRA_HELM_REPO}/prometheus-process-exporter --namespace=kube-system \
     ${OSH_INFRA_EXTRA_HELM_ARGS_PROCESS_EXPORTER}
 
 #NOTE: Wait for deploy
diff --git a/tools/deployment/monitoring/prometheus.sh b/tools/deployment/monitoring/prometheus.sh
index ce0ebb62a..1217f873a 100755
--- a/tools/deployment/monitoring/prometheus.sh
+++ b/tools/deployment/monitoring/prometheus.sh
@@ -14,11 +14,13 @@
 
 set -xe
 
+: ${OSH_INFRA_HELM_REPO:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 FEATURE_GATES="alertmanager ceph elasticsearch kubernetes nodes openstack postgresql apparmor"
-: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -c prometheus ${FEATURE_GATES} ${FEATURES})"}
+: ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS:="$(helm osh get-values-overrides -p ${OSH_INFRA_PATH} -c prometheus ${FEATURE_GATES} ${FEATURES})"}
 
 #NOTE: Deploy command
-helm upgrade --install prometheus ./prometheus \
+helm upgrade --install prometheus ${OSH_INFRA_HELM_REPO}/prometheus \
     --namespace=osh-infra \
     ${OSH_INFRA_EXTRA_HELM_ARGS:=} \
     ${OSH_INFRA_EXTRA_HELM_ARGS_PROMETHEUS}