diff --git a/Makefile b/Makefile
index 33dffb80756..2549eedfd7e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ REPO=composablefi
 SERVICE_NAME=composable
 INSTALL_DIR=docker/
 IMAGE_URL:=${REPO}/${SERVICE_NAME}
-RELEASE_VERSION:=$(shell git tag --sort=committerdate | grep -E '^${CHAIN}[0-9]' | tail -1)
-CARGO_VERSION:=$(sed -i '' "s|^version =.*|version = "${VERSION}"|" node/Cargo.toml)
+RELEASE_VERSION:=$(shell git tag --sort=committerdate | grep -E '^${CHAIN}-[0-9]' | tail -1 | tr -d '${CHAIN}-')
+CARGO_VERSION:=$(shell git tag --sort=committerdate | grep -E '^${CHAIN}-[0-9]' | tail -1 | tr -d '${CHAIN}-')
 AUTO_UPDATE:=1
 
 
@@ -51,7 +51,7 @@ dev:
 .PHONY: version
 version:
 	@if [ ${RELEASE_VERSION} ]; then \
-	sed -i "s|^version =.*|version = '"${RELEASE_VERSION}"'|" node/Cargo.toml; \
+	sed -i "s|^version =.*|version = '"${CARGO_VERSION}"'|" node/Cargo.toml; \
 	fi;
 
 .PHONY: containerize-release
@@ -113,4 +113,4 @@ define print_help_text
 	make stop				     : Stop all current running containers
 	make push				     : Push all built images to the specified docker registry
 "
-endef
\ No newline at end of file
+endef