diff --git a/Helm_Deployment.md b/Helm_Deployment.md
index 7395dd92..947767d5 100644
--- a/Helm_Deployment.md
+++ b/Helm_Deployment.md
@@ -6,7 +6,13 @@ The Helm charts for Neon Diana are the recommended method for production deploym
 Before deploying a Diana backend, ensure the following has been completed:
 - Kubernetes Cluster is deployed and `helm` CLI is properly configured
 - Desired domain is ready to forward all relevant subdomains to the cluster
-
+- Add the following Helm repositories:
+  ```shell
+  helm repo add diana https://neongeckocom.github.io/neon-diana-utils
+  helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+  helm repo add jetstack https://charts.jetstack.io
+  helm repo add bitnami https://charts.bitnami.com/bitnami
+  ```
 ## Backend Configuration
 Configure the backend deployment with 
 `diana configure-mq-backend <output_path>`. Follow the shell prompts to 
diff --git a/scripts/build_helm_charts.sh b/scripts/build_helm_charts.sh
index ec9096fb..dc8424ad 100644
--- a/scripts/build_helm_charts.sh
+++ b/scripts/build_helm_charts.sh
@@ -24,9 +24,62 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-git clone https://github.com/neongeckocom/neon-diana-utils -b helm-charts
-helm package ../neon_diana_utils/helm_charts/*
-helm repo index --url https://neongeckocom.github.io/helm-charts helm-charts
+cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.." || exit 0
+
+helm repo add diana https://neongeckocom.github.io/neon-diana-utils
+helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+helm repo add jetstack https://charts.jetstack.io
+helm repo add bitnami https://charts.bitnami.com/bitnami
+
+git clone https://github.com/NeonGeckoCom/neon-diana-utils -b helm-charts helm-charts > /dev/null
+cd helm-charts || exit 10
+
+# Package Base libraries
+for d in ../neon_diana_utils/helm_charts/base/*; do
+  helm dependency build "${d}" > /dev/null
+done
+helm package ../neon_diana_utils/helm_charts/base/*
+
+# Package HTTP Services
+for d in ../neon_diana_utils/helm_charts/http/*; do
+  helm dependency build "${d}" > /dev/null
+done
+helm package ../neon_diana_utils/helm_charts/http/*
+
+# Package MQ Services
+for d in ../neon_diana_utils/helm_charts/mq/*; do
+  helm dependency build "${d}"
+done
+helm package ../neon_diana_utils/helm_charts/mq/*
+
+# Package Backend
+for d in ../neon_diana_utils/helm_charts/backend/*-services; do
+  helm dependency build "${d}" > /dev/null
+done
+helm package ../neon_diana_utils/helm_charts/backend/*-services
+helm dependency build ../neon_diana_utils/helm_charts/backend/diana-backend > /dev/null
+helm package ../neon_diana_utils/helm_charts/backend/*
+
+# Package Neon
+for d in ../neon_diana_utils/helm_charts/neon/neon-*; do
+  helm dependency build "${d}" > /dev/null
+done
+helm package ../neon_diana_utils/helm_charts/neon/neon-*
+helm dependency build ../neon_diana_utils/helm_charts/neon/core > /dev/null
+helm package ../neon_diana_utils/helm_charts/neon/*
+
+# Package Klat
+for d in ../neon_diana_utils/helm_charts/klat/*; do
+  helm dependency build "${d}" > /dev/null
+done
+helm package ../neon_diana_utils/helm_charts/klat/*
+
+# Make sure existing charts aren't touched (new charts get new versions)
+git reset --hard HEAD
+
+# Update index.yaml and push changes
+helm repo index --url https://neongeckocom.github.io/neon-diana-utils .
 git add .
 git commit -m "Update Helm Charts"
-git push --set-upstream origin helm-charts
+git push
+cd .. && rm -rf helm-charts