diff --git a/Makefile b/Makefile
index d65b17e..1f0b7fd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,11 @@ VERSION=v1
 BIN_PATH=build/sysroot/usr/bin
 BUILD_PATH=build
 CUR_DIR=$(PWD)
-CURTAG=v1.4.0
+CUR_TAG ?= $(shell git describe --tags --match '*.*.*' | sort -V | tail -n1)
 ARCHIVE_PATH=buildzip
 PACKAGE_NAME=$(OS)-$(ARCHITECHTURE)-nextzenos-user-service-$(TAG)
-TAG_MESSAGE=test
+TAG_MESSAGE ?= ""
+
 build_service:
 	$(GORELEASERBUILD) --clean --snapshot -f .goreleaser.debug.yaml --id $(SERVICE)-$(ARCHITECHTURE)
 
@@ -21,18 +22,22 @@ package:
 	 && tar -czvf $(PACKAGE_NAME).tar.gz $(CUR_DIR)/$(BUILD_PATH)
 
 archive_package:
-	@mkdir -p $(CUR_DIR)/$(ARCHIVE_PATH)/$(CURTAG)
-	@mv $(PACKAGE_NAME).tar.gz $(CUR_DIR)/$(ARCHIVE_PATH)/$(CURTAG)/
+	@mkdir -p $(CUR_DIR)/$(ARCHIVE_PATH)/$(CUR_TAG)
+	@mv $(PACKAGE_NAME).tar.gz $(CUR_DIR)/$(ARCHIVE_PATH)/$(CUR_TAG)/
 remove_package:
 	rm $(PACKAGE_NAME).tar.gz
 clear_archive:
 	@rm -rf $(CUR_DIR)/$(ARCHIVE_PATH)
-create_release:
+#make create_release CUR_TAG=x.x TAG_MESSAGE=this is tag message
+create_tag:
 	@${GIT} push ${GIT_REMOTE}
-	@${GIT} tag -a ${CURTAG} -m "${TAG_MESSAGE}" || { echo "Failed to create tag"; exit 1; }
-	@${GIT} push ${GIT_REMOTE} ${CURTAG} ||  { echo "Failed to push tag"; exit 1; }
+	@${GIT} tag -a ${CUR_TAG} -m "${TAG_MESSAGE}" || { echo "Failed to create tag"; exit 1; }
+	@${GIT} push ${GIT_REMOTE} ${CUR_TAG} ||  { echo "Failed to push tag"; exit 1; }
 	@export GORELEASER_PREVIOUS_TAG=${PREVTAG}
-push_release_multi:
+remove_tag:
+	@${GIT} tag -d ${CUR_TAG}
+	@${GIT} push ${GIT_REMOTE} -d ${CUR_TAG}	
+push_release_all:
 	${GORELEASER} release --clean
 push_release:
-	${GORELEASER} release --clean
+	${GORELEASER} release --single-target