diff --git a/helm.mk b/helm.mk
index 06d39cb..394fb8c 100644
--- a/helm.mk
+++ b/helm.mk
@@ -23,15 +23,21 @@ ifdef HELM_REPO_URL
 	@- helm repo update $(HELM_CHART_NAME)
 endif
 
-	@ $(eval helm_params = $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --wait --values)
 ifdef DEBUG_MODE
-	@ $(eval helm_params = $(helm_params) --debug)
-endif
-ifdef K8S_KUBECONFIG
-	@ $(eval helm_params = $(helm_params) --kubeconfig $(K8S_KUBECONFIG))
-endif
-	@ $(eval helm_params = $(helm_params) - --version $(HELM_CHART_VERSION))
+	@- echo "\n### deploying helm chart with --debug flag"
+	@- echo "-- DEBUG DEPLOYMENT --------------------"
+	@- echo " "
+	@- echo "Namespace: $(K8S_NAMESPACE)"
+	@- echo "Helm Chart: $(HELM_CHART_PATH)"
+	@- echo "Helm Version (use latest if empty): $(HELM_CHART_VERSION)"
+	@- echo "Values File: $(HELM_VALUES_FILE)"
+	@- echo " "
+	@- echo "----------------------------------"
 
+	@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --debug --wait --values - --version "$(HELM_CHART_VERSION)"
+
+else
+	
 	@- echo "\n### deploying helm chart"
 	@- echo "-- DEPLOYMENT --------------------"
 	@- echo " "
@@ -42,7 +48,10 @@ endif
 	@- echo " "
 	@- echo "----------------------------------"
 
-	envsubst < $(HELM_VALUES_FILE) | helm upgrade $(helm_params)
+	@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --wait --values - --version "$(HELM_CHART_VERSION)"
+
+endif
+
 
 pull-helm:
 # nop