diff --git a/Makefile b/Makefile
index 089a50c..e4181b9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,12 @@ HELM := helm
 TASK := build
 
 EXCLUDES := helm-toolkit docs tests tools logs
-CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
+CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
 CHART := divingbell
 
-all: $(CHARTS)
+all: $(CHART)
 
-$(CHARTS):
+$(CHART):
 	@echo
 	@echo "===== Processing [$@] chart ====="
 	@make $(TASK)-$@
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 9ed74a0..6eabfc6 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -56,8 +56,9 @@ git clone --depth 1 $HTK_REPO || true
 pushd openstack-helm/$HTK_PATH
 
 git pull
-helm_serve
 make helm-toolkit
+helm_serve
+
 popd && popd
 for c in $DEP_UP_LIST
 do