diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index bc2ab7908b..2708efad43 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -37,5 +37,5 @@ clouds:
       auth_url: 'http://keystone.openstack.svc.cluster.local/v3'
 EOF
 
-#NOTE: Build charts
-make all
+#NOTE: Build helm-toolkit, most charts depend on helm-toolkit
+make helm-toolkit