diff --git a/charts/Makefile b/charts/Makefile
index 235740b8..0d50c589 100644
--- a/charts/Makefile
+++ b/charts/Makefile
@@ -16,7 +16,7 @@ TASK  := build
 
 EXCLUDES := playbooks roles doc tests tools logs tmp zuul.d releasenotes
 # NOTE(Portdirect): Exlude chart directories that are presnt only for the purposes of housing over-rides
-EXCLUDES += harbor loki gerrit ldap
+EXCLUDES += gerrit ldap
 CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
 
 .PHONY: $(EXCLUDES) $(CHARTS)
@@ -32,13 +32,13 @@ $(CHARTS):
 
 init-%:
 	if [ -f $*/Makefile ]; then make -C $*; fi
-	if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
+	helm dependency update $*
 
 lint-%: init-%
-	if [ -d $* ]; then helm lint $*; fi
+	helm lint $*
 
 build-%: lint-%
-	if [ -d $* ]; then helm package $*; fi
+	helm package $*
 
 clean:
 	@echo "Clean all build artifacts"
diff --git a/charts/harbor/Chart.yaml b/charts/harbor/Chart.yaml
index 65bf6cdb..143743ee 100644
--- a/charts/harbor/Chart.yaml
+++ b/charts/harbor/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: harbor-utils
+name: harbor
 description: Harbor utility chart
 type: application
 version: 0.1.0
diff --git a/tools/gate/jarvis/300-deploy-loki.sh b/tools/gate/jarvis/300-deploy-loki.sh
index 13aa0c4e..f6e28457 100755
--- a/tools/gate/jarvis/300-deploy-loki.sh
+++ b/tools/gate/jarvis/300-deploy-loki.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 set -ex
 
-cd ./charts/loki
-helm dep up
-cd -
+make -C ./charts loki
 
 # shellcheck disable=SC2046
 helm upgrade \
diff --git a/tools/gate/jarvis/400-deploy-harbor.sh b/tools/gate/jarvis/400-deploy-harbor.sh
index 2a58c609..3abf6095 100755
--- a/tools/gate/jarvis/400-deploy-harbor.sh
+++ b/tools/gate/jarvis/400-deploy-harbor.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 set -ex
 
-cd ./charts/harbor
-helm dep up
-cd -
+make -C ./charts harbor
 
 # shellcheck disable=SC2046
 helm upgrade \