diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 8aa2510c1..c0c66ab49 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -472,10 +472,15 @@ distclean:
 PHONY: (VERSION)
 $(VERSION): $(HV_CONFIG_H)
 	touch $(VERSION)
-	@COMMIT=`git rev-parse --verify --short HEAD 2>/dev/null`;\
-	DIRTY=`git diff-index --name-only HEAD`;\
-	if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
-	DAILY_TAG=`git tag --merged HEAD|grep "acrn"|tail -n 1`;\
+	@if [ "$(BUILD_VERSION)"x = x -o "$(BUILD_TAG)"x = x ];then \
+		COMMIT=`git rev-parse --verify --short HEAD 2>/dev/null`;\
+		DIRTY=`git diff-index --name-only HEAD`;\
+		if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
+		DAILY_TAG=`git tag --merged HEAD|grep "acrn"|tail -n 1`;\
+	else \
+		PATCH="$(BUILD_VERSION)"; \
+		DAILY_TAG="$(BUILD_TAG)"; \
+	fi; \
 	TIME=$$(date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" "+%F %T"); \
 	USER="$${USER:-$$(id -u -n)}"; \
 	if [ x$(CONFIG_RELEASE) = "xy" ];then BUILD_TYPE="REL";else BUILD_TYPE="DBG";fi;\
diff --git a/misc/debug_tools/acrn_crashlog/acrnprobe/Makefile b/misc/debug_tools/acrn_crashlog/acrnprobe/Makefile
index 52692f31e..6e1cbbc65 100644
--- a/misc/debug_tools/acrn_crashlog/acrnprobe/Makefile
+++ b/misc/debug_tools/acrn_crashlog/acrnprobe/Makefile
@@ -63,9 +63,13 @@ $(VERSION_H):
 		mkdir -p $(BUILDDIR)/include/acrnprobe ; \
 	fi
 	touch $(VERSION_H)
-	@COMMIT=`git log -1 --pretty=format:%h . 2>/dev/null`;\
-	DIRTY=`git diff --name-only $(CURDIR)`;\
-	if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
+	@if [ "$(BUILD_VERSION)"x = x ];then \
+		COMMIT=`git log -1 --pretty=format:%h . 2>/dev/null`;\
+		DIRTY=`git diff --name-only $(CURDIR)`;\
+		if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
+	else \
+		PATCH="$(BUILD_VERSION)"; \
+	fi; \
 	TIME=$$(date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" "+%Y-%m-%d %H:%M:%S"); \
 	USER="$${USER:-$$(id -u -n)}"; \
 	cat $(CURDIR)/../license_header > $(VERSION_H);\
diff --git a/misc/debug_tools/acrn_crashlog/usercrash/Makefile b/misc/debug_tools/acrn_crashlog/usercrash/Makefile
index a7e5471c1..d21d4a98e 100644
--- a/misc/debug_tools/acrn_crashlog/usercrash/Makefile
+++ b/misc/debug_tools/acrn_crashlog/usercrash/Makefile
@@ -42,9 +42,13 @@ $(VERSION_H):
 		mkdir -p $(BUILDDIR)/include/usercrash ; \
 	fi
 	touch $(VERSION_H)
-	@COMMIT=`git log -1 --pretty=format:%h . 2>/dev/null`;\
-	DIRTY=`git diff --name-only $(CURDIR)`;\
-	if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
+	@if [ "$(BUILD_VERSION)"x = x ];then \
+		COMMIT=`git log -1 --pretty=format:%h . 2>/dev/null`;\
+		DIRTY=`git diff --name-only $(CURDIR)`;\
+		if [ -n "$$DIRTY" ];then PATCH="$$COMMIT-dirty";else PATCH="$$COMMIT";fi;\
+	else \
+		PATCH="$(BUILD_VERSION)"; \
+	fi; \
 	TIME=$$(date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" "+%Y-%m-%d %H:%M:%S"); \
 	USER="$${USER:-$$(id -u -n)}"; \
 	cat $(CURDIR)/../license_header > $(VERSION_H);\