diff --git a/minikube-setup/Makefile b/minikube-setup/Makefile
index 25741a8..7afb809 100644
--- a/minikube-setup/Makefile
+++ b/minikube-setup/Makefile
@@ -3,25 +3,48 @@ driver?=virtualbox
 memory?=2048
 cpu?=4
 nodes?=1
+image_tag?=latest
 
+MAKEFILE_DIRECTORY:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 .PHONY: init-cluster
 init-cluster:
 	minikube start \
-        --kubernetes-version $(kubernetes-version) \
-        --driver $(driver) \
-        --memory $(memory) \
-        --cpus $(cpu) \
-        --nodes $(nodes) \
-        --embed-certs  \
+		--kubernetes-version $(kubernetes-version) \
+		--driver $(driver) \
+		--memory $(memory) \
+		--cpus $(cpu) \
+		--nodes $(nodes) \
+		--embed-certs  \
 		--static-ip 10.211.55.70
 
 
 .PHONY: setup-cluster
 setup-cluster: 
-	kubectl apply -f manifests && helm install kubeinvaders --set-string config.target_namespace="namespace1,namespace2" \
-	-n kubeinvaders kubeinvaders/kubeinvaders --set ingress.enabled=true --set ingress.hostName=kubeinvaders.local --set deployment.image.tag=v1.9.6 && minikube addons enable ingress
+	kubectl apply -f ${MAKEFILE_DIRECTORY}/manifests \
+		&& helm upgrade --install kubeinvaders \
+			--set-string config.target_namespace="ns-1" \
+			-n kubeinvaders \
+			kubeinvaders/kubeinvaders \
+			--set ingress.enabled=true \
+			--set ingress.hostName=kubeinvaders.local \
+			--set deployment.image.tag=$(image_tag) \
+		&& minikube addons enable ingress
 
+.PHONY: dev-cluster
+dev-cluster:
+	kubectl apply -f ${MAKEFILE_DIRECTORY}/manifests \
+		&& helm upgrade --install kubeinvaders \
+			--set-string config.target_namespace="ns-1" \
+			-n kubeinvaders \
+			${MAKEFILE_DIRECTORY}/../helm-charts/kubeinvaders \
+			--set ingress.enabled=true \
+			--set ingress.hostName=kubeinvaders.local \
+			--set deployment.image.tag=$(image_tag) \
+		&& minikube addons enable ingress
+
+.PHONY: develop
+develop: init-cluster dev-cluster
 
 .PHONY: setup
 setup: init-cluster setup-cluster