diff --git a/build/core/main_version.mk b/build/core/main_version.mk
index 0e85d82..ef912a2 100644
--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
@@ -5,6 +5,7 @@
 endif
 
 ADDITIONAL_SYSTEM_PROPERTIES += \
+  ro.bliss.codename=$(BLISS_CODENAME) \
   ro.bliss.version=$(BLISS_DISPLAY_VERSION) \
   ro.bliss.build.status=$(BLISS_BUILDTYPE) \
   ro.bliss.changelog.version=Changelog-$(BLISS_VERSION) \
diff --git a/config/versions.mk b/config/versions.mk
index 785c80d..11196c5 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -2,6 +2,7 @@
 # Bliss RELEASE VERSION
 BLISS_VERSION_MAJOR = 15
 BLISS_VERSION_MINOR = 0
+BLISS_CODENAME = Arcadia
 BLISS_VERSION_MAINTENANCE = Alpha
 
 ifneq ($(SIGNING_KEYS),)
@@ -15,7 +16,7 @@
 BLISS_BUILD_VARIANT ?= vanilla
 
 #ifdef BLISS_VERSION_MAINTENANCE
-    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
+    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_CODENAME)-$(BLISS_VERSION_MAINTENANCE)
 #else
 #    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)
 #endif