diff --git a/Makefile b/Makefile
index ea67d2ba0..f8d9039b6 100644
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,9 @@ helm-package.%: # Package Helm chart
 	$(eval COMMAND := $(word 1,$(subst ., ,$*)))
 	$(eval CHART_NAME := $(COMMAND))
 	helm lint $(CHARTS_FOLDER)/${CHART_NAME}
+	sed -i "s/tag: latest/tag: ${CHART_VERSION}/g" $(CHARTS_FOLDER)/${CHART_NAME}/values.yaml
 	helm package $(CHARTS_FOLDER)/${CHART_NAME} --app-version ${VERSION} --version ${CHART_VERSION} --destination ${CHART_OUTPUT_DIR}/
+	git checkout -- $(CHARTS_FOLDER)/${CHART_NAME}/values.yaml
 
 .PHONY: helm-push.%
 helm-push.%: helm-package.%