diff --git a/.ci/podman.mk b/.ci/podman.mk
index 1d6213d..4a51640 100644
--- a/.ci/podman.mk
+++ b/.ci/podman.mk
@@ -1,7 +1,12 @@
 # Parse version from latest git semver tag
-GIT_BRANCH ?= $(shell git name-rev --name-only HEAD 2>/dev/null | sed -e 's,remotes/origin/,,' -e 's/[^a-zA-Z0-9]/-/g')
 GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
 
+GIT_BRANCH ?= $(shell git name-rev --name-only HEAD 2>/dev/null | sed -e 's,remotes/origin/,,' -e 's/[^a-zA-Z0-9]/-/g')
+# if "tags/" is in the branchname we are actually on a tag and need to use rev-parse instead
+ifeq ($(findstring tags/, $(GIT_TAG)),)
+	GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
+endif
+
 TAG := $(GIT_TAG)
 # append branch name to tag if NOT main nor master
 ifeq (,$(filter main master, $(GIT_BRANCH)))