diff --git a/Makefile b/Makefile
index c6a471b07..64f0d0609 100644
--- a/Makefile
+++ b/Makefile
@@ -38,5 +38,8 @@ build: cluster
 
 deploy: build
 	export RANDOM_PART=$$(hostname | md5sum | cut -c1-30) && \
-	envsubst < kube/petclinic.yaml.tmpl > kube/petclinic.yaml 
-	minikube kubectl apply -f kube
\ No newline at end of file
+	minikube kubectl -- apply -f kube/postgresql.yaml && \
+	envsubst < kube/petclinic.yaml | minikube kubectl -- apply -f -
+
+undeploy:
+	minikube kubectl -- delete -f kube/
\ No newline at end of file