diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index 20dd3d9..7348765 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -60,7 +60,9 @@
           helm init --client-only
           helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
           helm repo add rook-beta https://charts.rook.io/beta
-          ./scripts/helmrepo.sh
+
+          git clone https://gerrit.opencord.org/helm-repo-tools
+          ./helm-repo-tools/helmrepo.sh
 
           # Copy repo to host
           rsync -rvzh chart_repo/ {docs-ssh-host}:/var/www/charts
diff --git a/jjb/lint.yaml b/jjb/lint.yaml
index 73e9bbf..62d0ce4 100644
--- a/jjb/lint.yaml
+++ b/jjb/lint.yaml
@@ -134,7 +134,8 @@
           helm repo add rook-beta https://charts.rook.io/beta
           helm repo add cord https://charts.opencord.org
 
-          ./scripts/helmlint.sh clean
+          git clone https://gerrit.opencord.org/helm-repo-tools
+          ./helm-repo-tools/helmlint.sh clean
 
 
 # run `shellcheck` to validate shell scripts charts
diff --git a/jjb/pipeline/all-xos-api-test-helm.groovy b/jjb/pipeline/all-xos-api-test-helm.groovy
index a6d94f8..4d03a09 100644
--- a/jjb/pipeline/all-xos-api-test-helm.groovy
+++ b/jjb/pipeline/all-xos-api-test-helm.groovy
@@ -219,7 +219,9 @@
            pushd cord/helm-charts
 
            helm install -f examples/kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
-           scripts/wait_for_pods.sh
+           
+           git clone https://gerrit.opencord.org/helm-repo-tools
+           helm-repo-tools/wait_for_pods.sh
 
            helm dep up xos-core
            helm install \${helm_install_args} xos-core -n xos-core
@@ -268,7 +270,7 @@
            fi
 
            # wait for services to load
-           JOBS_TIMEOUT=900 ./scripts/wait_for_jobs.sh
+           JOBS_TIMEOUT=900 ./helm-repo-tools/wait_for_jobs.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
diff --git a/jjb/pipeline/chart-api-test-helm.groovy b/jjb/pipeline/chart-api-test-helm.groovy
index 8ac098f..99a34b0 100644
--- a/jjb/pipeline/chart-api-test-helm.groovy
+++ b/jjb/pipeline/chart-api-test-helm.groovy
@@ -85,7 +85,9 @@
 
            pushd cord/helm-charts
            helm install -f examples/kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
-           ./scripts/wait_for_pods.sh
+
+           git clone https://gerrit.opencord.org/helm-repo-tools
+           ./helm-repo-tools/wait_for_pods.sh
 
            popd
            '''
@@ -114,7 +116,7 @@
            helm install \${helm_install_args} workflows/att-workflow -n att-workflow
 
            # wait for services to load
-           PODS_TIMEOUT=900 ./scripts/wait_for_pods.sh
+           PODS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
@@ -186,7 +188,7 @@
            helm install \${helm_install_args} xos-profiles/rcord-lite -n rcord-lite
 
            # wait for services to load
-           PODS_TIMEOUT=900 ./scripts/wait_for_pods.sh
+           PODS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
@@ -259,7 +261,7 @@
            helm install \${helm_install_args} xos-profiles/mcord -n mcord
 
            # wait for services to load
-           PODS_TIMEOUT=900 ./scripts/wait_for_pods.sh
+           PODS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
@@ -331,7 +333,7 @@
            helm install \${helm_install_args} xos-profiles/demo-simpleexampleservice -n demo-simpleexampleservice
 
            # wait for services to load
-           PODS_TIMEOUT=900 ./scripts/wait_for_pods.sh
+           PODS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
@@ -404,7 +406,7 @@
            helm install \${helm_install_args} xos-services/hippie-oss -n hippie-oss
 
            # wait for services to load
-           PODS_TIMEOUT=900 ./scripts/wait_for_pods.sh
+           PODS_TIMEOUT=900 ./helm-repo-tools/wait_for_pods.sh
 
            echo "# Checking helm deployments"
            kubectl get pods
diff --git a/jjb/pipeline/workflow-validations.groovy b/jjb/pipeline/workflow-validations.groovy
index f7cb591..106f5b8 100644
--- a/jjb/pipeline/workflow-validations.groovy
+++ b/jjb/pipeline/workflow-validations.groovy
@@ -87,7 +87,9 @@
            pushd cord/helm-charts
 
            helm install -f examples/kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
-           scripts/wait_for_pods.sh
+
+           git clone https://gerrit.opencord.org/helm-repo-tools
+           helm-repo-tools/wait_for_pods.sh
 
            helm dep up xos-core
            helm install xos-core -n xos-core
@@ -97,7 +99,7 @@
            helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
 
            # wait for services to load
-           JOBS_TIMEOUT=900 ./scripts/wait_for_jobs.sh
+           JOBS_TIMEOUT=900 ./helm-repo-tools/wait_for_jobs.sh
            sleep 300
            echo "# Checking helm deployments"
            kubectl get pods
diff --git a/jjb/pipeline/xos-synchronizer-update.groovy b/jjb/pipeline/xos-synchronizer-update.groovy
index 4b2cf96..570cc5f 100644
--- a/jjb/pipeline/xos-synchronizer-update.groovy
+++ b/jjb/pipeline/xos-synchronizer-update.groovy
@@ -241,7 +241,9 @@
            pushd cord/helm-charts
 
            helm install -f examples/kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
-           scripts/wait_for_pods.sh
+
+           git clone https://gerrit.opencord.org/helm-repo-tools
+           helm-repo-tools/wait_for_pods.sh
 
            helm dep up xos-core
            helm install \${helm_install_args} xos-core -n xos-core
@@ -286,7 +288,7 @@
            fi
 
            # wait for services to load
-           JOBS_TIMEOUT=900 ./scripts/wait_for_jobs.sh
+           JOBS_TIMEOUT=900 ./helm-repo-tools/wait_for_jobs.sh
 
            echo "# Checking helm deployments"
            kubectl get pods