diff --git a/core/definitions.mk b/core/definitions.mk
index e2d5de4f0..b9ef4d57f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1830,6 +1830,10 @@ endef
 
 # Add BUILD_NUMBER to apps default version name if it's unbundled build.
 ifdef TARGET_BUILD_APPS
+TARGET_BUILD_WITH_APPS_VERSION_NAME := true
+endif
+
+ifdef TARGET_BUILD_WITH_APPS_VERSION_NAME
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)
 else
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)