diff --git a/core/Makefile b/core/Makefile
index 5badde5587efa10f6848d29119d5371ccc257feb..cd11ae88adb09bed2fc82737dca24095e991397c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -174,7 +174,7 @@ ifeq ($(TARGET_BUILD_VARIANT),user)
   ifeq "true" "$(DISPLAY_BUILD_NUMBER)"
     BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS)
   else
-    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)
+    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_NUMBER) 
   endif
 else
   # Non-user builds should show detailed build information
diff --git a/core/build_id.mk b/core/build_id.mk
index 072f442d9eb5a323ea3805d1942622cb7342ca38..57551798619420ab1e64d4afb41798e75872f58a 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=N6F26Q
+export BUILD_ID=v1.0-rc5
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 550fc70ce70aa6dc00acc6326fbb211f7c0d1205..43005317e68d62c8cb5e8cd899ef20428f68b2ff 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -156,5 +156,5 @@ ifeq "" "$(BUILD_NUMBER)"
   # If no BUILD_NUMBER is set, create a useful "I am an engineering build
   # from this date/time" value.  Make it start with a non-digit so that
   # anyone trying to parse it as an integer will probably get "0".
-  BUILD_NUMBER := eng.$(shell echo $${USER:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S)
+  BUILD_NUMBER := $(shell $(DATE) +%Y%m%d.%H%M%S)
 endif