diff --git a/.circleci/publish_helm_charts.sh b/.circleci/publish_helm_charts.sh
index b9a02ff3..9ae42ce7 100755
--- a/.circleci/publish_helm_charts.sh
+++ b/.circleci/publish_helm_charts.sh
@@ -2,6 +2,7 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 REVISION=${GITHUB_TAG:-$GIT_SHA1}
+LOCAL_HELM_MOJALOOP_REPO_URI=${HELM_MOJALOOP_REPO_URI:-'https://mojaloop.github.io/charts/repo'}
 
 echo "DIR=${DIR}"
 echo "PWD=${PWD}"
@@ -28,6 +29,10 @@ echo "Moving packaged charts to release directory and repo folder" | tee git.log
 mv repo/*.* $WORKING_RELEASE_DIRECTORY/repo
 mv README.md LICENSE.md CODEOWNERS $WORKING_RELEASE_DIRECTORY
 
+echo "Indexing repo folder" | tee git.log
+cd $WORKING_RELEASE_DIRECTORY/repo
+helm repo index . --url "$LOCAL_HELM_MOJALOOP_REPO_URI"
+
 echo "Switching to release directory" | tee git.log
 cd $WORKING_RELEASE_DIRECTORY
 git status
diff --git a/README.md b/README.md
index c73a1ea3..45449452 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Here you will find the Business Operational Helm Charts for Reporting Services,
 
 ## Quick Links
 
-- [http://docs.mojaloop.io/charts/](http://docs.mojaloop.io/charts/) Mojaloop Published Helm Repo
+- [https://mojaloop.github.io/charts/](https://mojaloop.github.io/charts) Mojaloop Published Helm Repo
 - [Documentation - Deploying Mojaloop](https://docs.mojaloop.io/documentation/deployment-guide)
 - [Helm v3 Docs](https://docs.helm.sh/)
 
diff --git a/scripts/package.sh b/scripts/package.sh
index c3f63c9e..77720f82 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -2,8 +2,7 @@
 
 set -e
 
-#LOCAL_HELM_MOJALOOP_REPO_URI=${HELM_MOJALOOP_REPO_URI:-'https://docs.mojaloop.io/charts/repo'}
-LOCAL_HELM_MOJALOOP_REPO_URI=https://docs.mojaloop.io/charts/repo ## https://mojaloop.github.io/charts/repo
+LOCAL_HELM_MOJALOOP_REPO_URI=${HELM_MOJALOOP_REPO_URI:-'https://mojaloop.github.io/charts/repo'}
 
 #
 # Script to Package all charts, and create an index.yaml in ./repo directory
@@ -76,7 +75,7 @@ do
 done
 
 cd ./repo
-helm repo index . --url $LOCAL_HELM_MOJALOOP_REPO_URI
+helm repo index . --url "$LOCAL_HELM_MOJALOOP_REPO_URI"
 
 set +x