diff --git a/Makefile b/Makefile
index a595aa6f..dc63da39 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ IMAGE_NAME      ?= armada
 HELM            ?= helm
 LABEL           ?= commit-id
 PYTHON          = python3
-CHART      = charts/armada
+CHART           = armada
 
 # VERSION INFO
 GIT_COMMIT = $(shell git rev-parse HEAD)
@@ -65,7 +65,8 @@ images: check-docker
 .PHONY: dry-run
 dry-run: clean
 	tools/helm_tk.sh $(HELM)
-	$(HELM) template $(CHART)
+	$(HELM) dep up charts/$(CHART)
+	$(HELM) template charts/$(CHART)
 
 # make tools
 .PHONY: protoc
@@ -104,9 +105,10 @@ test-pep8: check-tox
 .PHONY: helm-lint
 helm_lint:
 	@tools/helm_tk.sh $(HELM)
-	$(HELM) lint $(CHART)
+	$(HELM) dep up charts/$(CHART)
+	$(HELM) lint charts/$(CHART)
 
 .PHONY: charts
 charts: clean
-	$(HELM) dep up $(CHART)
-	$(HELM) package $(CHART)
+	$(HELM) dep up charts/$(CHART)
+	$(HELM) package charts/$(CHART)
diff --git a/charts/tiller/templates/deployment-tiller.yaml b/charts/tiller/templates/deployment-tiller.yaml
index dc494712..de58d2a7 100644
--- a/charts/tiller/templates/deployment-tiller.yaml
+++ b/charts/tiller/templates/deployment-tiller.yaml
@@ -76,6 +76,11 @@ spec:
           successThreshold: 1
           timeoutSeconds: 1
         name: tiller
+        command:
+          - /tiller
+          - -logtostderr
+          - -v
+          - {{ .Values.conf.tiller.verbosity | quote }}
         ports:
         - containerPort: 44134
           name: tiller
diff --git a/charts/tiller/values.yaml b/charts/tiller/values.yaml
index 3732e60b..1f918ab6 100644
--- a/charts/tiller/values.yaml
+++ b/charts/tiller/values.yaml
@@ -32,6 +32,10 @@ deployment:
   # no limit.
   tiller_history: 0
 
+conf:
+  tiller:
+    verbosity: 5
+
 manifests:
   deployment_tiller: true
   service_tiller_deploy: true
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 9eae2dca..8c203dbe 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -49,4 +49,3 @@ cd openstack-helm
 git pull
 helm_serve
 make charts
-${HELM} dep up ../../charts/armada