diff --git a/Makefile b/Makefile
index 1d0c338..25ab7d9 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,11 @@ clean:
 
 # CI/CD Targets
 ci-version:
-	@echo "==> Extracting version"
 	@VERSION=$$(sed -n "s/^-- version: //p" inc/meta/meta.header.lua | head -n 1 | tr -d "[:space:]"); \
+	BRANCH=$${CI_COMMIT_BRANCH:-$${WOODPECKER_BRANCH}}; \
+	if [ "$$BRANCH" != "main" ] && [ "$$BRANCH" != "master" ] && [ -n "$$BRANCH" ]; then \
+		VERSION=dev-$$VERSION-$$BRANCH; \
+	fi; \
 	echo "VERSION is: $$VERSION"; \
 	echo $$VERSION > $(VERSION_FILE)