diff --git a/Makefile b/Makefile
index 077c779d..d10dd0b4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ BUNDLE_DEFAULT_CHANNEL:=--default-channel=$(DEFAULT_CHANNEL)
 endif
 BUNDLE_METADATA_OPTS?=$(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
-COMMIT_ID=$(shell git describe --abbrev=40 --always --dirty=+ 2>/dev/null)
-GIT_VERSION=$(shell git describe --match='v[0-9]*.[0-9].[0-9]' 2>/dev/null || echo "(unset)")
+COMMIT_ID=$(shell git describe --abbrev=40 --always --exclude='*' --dirty=+ 2>/dev/null)
+GIT_VERSION=$(shell git describe --match='v[0-9]*.[0-9]' --match='v[0-9]*.[0-9].[0-9]' 2>/dev/null || echo "(unset)")
 
 CONFIG_KUST_DIR:=config/default
 CRD_KUST_DIR:=config/crd