diff --git a/tools/deployment/baremetal/020-ingress.sh b/tools/deployment/baremetal/020-ingress.sh
index 984f8b9a..b1380942 100755
--- a/tools/deployment/baremetal/020-ingress.sh
+++ b/tools/deployment/baremetal/020-ingress.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images ingress
+#NOTE: Lint and package chart
+make ingress
 
 #NOTE: Deploy global ingress
 helm install ./ingress \
diff --git a/tools/deployment/baremetal/110-compute-kit.sh b/tools/deployment/baremetal/110-compute-kit.sh
index 6c7c9b4f..025c37f3 100755
--- a/tools/deployment/baremetal/110-compute-kit.sh
+++ b/tools/deployment/baremetal/110-compute-kit.sh
@@ -16,10 +16,10 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images neutron
-make pull-images ironic
-make pull-images nova
+#NOTE: Lint and package chart
+make neutron
+make ironic
+make nova
 
 #NOTE: Deploy neutron
 #NOTE(portdirect): for simplicity we will assume the default route device
diff --git a/tools/deployment/common/memcached.sh b/tools/deployment/common/memcached.sh
index 830b9252..77614185 100755
--- a/tools/deployment/common/memcached.sh
+++ b/tools/deployment/common/memcached.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images memcached
+#NOTE: Lint and package chart
+make memcached
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh
index 1ed97b2a..f50efb48 100755
--- a/tools/deployment/developer/ceph/040-ceph.sh
+++ b/tools/deployment/developer/ceph/040-ceph.sh
@@ -16,9 +16,9 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
+#NOTE: Lint and package chart
 for CHART in ceph-mon ceph-osd ceph-client; do
-  make pull-images "${CHART}"
+  make "${CHART}"
 done
 
 #NOTE: Deploy command
diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
index b00aa1f6..71ac287a 100755
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images ceph-client
+#NOTE: Lint and package chart
+make ceph-client
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index c2486b38..7946816b 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images ceph
+#NOTE: Lint and package chart
+make ceph
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index 9234d835..05f54c95 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images glance
+#NOTE: Lint and package chart
+make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ceph/130-cinder.sh b/tools/deployment/developer/ceph/130-cinder.sh
index 1dd7aef2..b66e6d65 100755
--- a/tools/deployment/developer/ceph/130-cinder.sh
+++ b/tools/deployment/developer/ceph/130-cinder.sh
@@ -15,8 +15,8 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images cinder
+#NOTE: Lint and package chart
+make cinder
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ceph/150-libvirt.sh b/tools/deployment/developer/ceph/150-libvirt.sh
index d2547b58..5123839a 100755
--- a/tools/deployment/developer/ceph/150-libvirt.sh
+++ b/tools/deployment/developer/ceph/150-libvirt.sh
@@ -15,8 +15,8 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images libvirt
+#NOTE: Lint and package chart
+make libvirt
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ceph/160-compute-kit.sh b/tools/deployment/developer/ceph/160-compute-kit.sh
index c1119f08..cba35168 100755
--- a/tools/deployment/developer/ceph/160-compute-kit.sh
+++ b/tools/deployment/developer/ceph/160-compute-kit.sh
@@ -15,9 +15,9 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images nova
-make pull-images neutron
+#NOTE: Lint and package chart
+make nova
+make neutron
 
 #NOTE: Deploy nova
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/030-ingress.sh b/tools/deployment/developer/common/030-ingress.sh
index 04b50003..3a3d9be8 100755
--- a/tools/deployment/developer/common/030-ingress.sh
+++ b/tools/deployment/developer/common/030-ingress.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images ingress
+#NOTE: Lint and package chart
+make ingress
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/050-mariadb.sh b/tools/deployment/developer/common/050-mariadb.sh
index d17175bd..1d3154df 100755
--- a/tools/deployment/developer/common/050-mariadb.sh
+++ b/tools/deployment/developer/common/050-mariadb.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images mariadb
+#NOTE: Lint and package chart
+make mariadb
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/060-rabbitmq.sh b/tools/deployment/developer/common/060-rabbitmq.sh
index 1b575c6f..0422e949 100755
--- a/tools/deployment/developer/common/060-rabbitmq.sh
+++ b/tools/deployment/developer/common/060-rabbitmq.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images rabbitmq
+#NOTE: Lint and package chart
+make rabbitmq
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/080-keystone.sh b/tools/deployment/developer/common/080-keystone.sh
index 3d728e29..c19aec70 100755
--- a/tools/deployment/developer/common/080-keystone.sh
+++ b/tools/deployment/developer/common/080-keystone.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images keystone
+#NOTE: Lint and package chart
+make keystone
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/090-heat.sh b/tools/deployment/developer/common/090-heat.sh
index ee418bf6..e1b92622 100755
--- a/tools/deployment/developer/common/090-heat.sh
+++ b/tools/deployment/developer/common/090-heat.sh
@@ -15,8 +15,8 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images heat
+#NOTE: Lint and package chart
+make heat
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/100-horizon.sh b/tools/deployment/developer/common/100-horizon.sh
index 03c59215..3c241310 100755
--- a/tools/deployment/developer/common/100-horizon.sh
+++ b/tools/deployment/developer/common/100-horizon.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images horizon
+#NOTE: Lint and package chart
+make horizon
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh
index 3f862b3e..6f06af4e 100755
--- a/tools/deployment/developer/common/140-openvswitch.sh
+++ b/tools/deployment/developer/common/140-openvswitch.sh
@@ -15,8 +15,8 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images openvswitch
+#NOTE: Lint and package chart
+make openvswitch
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/ldap/080-keystone.sh b/tools/deployment/developer/ldap/080-keystone.sh
index 744dc0ba..c2756714 100755
--- a/tools/deployment/developer/ldap/080-keystone.sh
+++ b/tools/deployment/developer/ldap/080-keystone.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Handle LDAP
-make pull-images ldap
+#NOTE: Lint and package chart
+make ldap
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index 59355028..3be380dd 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -16,8 +16,8 @@
 
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images glance
+#NOTE: Lint and package chart
+make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh
index bd620e92..650deada 100755
--- a/tools/deployment/developer/nfs/150-libvirt.sh
+++ b/tools/deployment/developer/nfs/150-libvirt.sh
@@ -15,8 +15,8 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images libvirt
+#NOTE: Lint and package chart
+make libvirt
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
diff --git a/tools/deployment/developer/nfs/160-compute-kit.sh b/tools/deployment/developer/nfs/160-compute-kit.sh
index 4c8e6f06..9c69e95b 100755
--- a/tools/deployment/developer/nfs/160-compute-kit.sh
+++ b/tools/deployment/developer/nfs/160-compute-kit.sh
@@ -15,9 +15,9 @@
 #    under the License.
 set -xe
 
-#NOTE: Pull images and lint chart
-make pull-images nova
-make pull-images neutron
+#NOTE: Lint and package chart
+make nova
+make neutron
 
 #NOTE: Deploy nova
 : ${OSH_EXTRA_HELM_ARGS:=""}