diff --git a/config/versions.mk b/config/versions.mk
index cf39407..8aff6ed 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -4,11 +4,11 @@
 BLISS_VERSION_MINOR = 5
 # BLISS_VERSION_MAINTENANCE = Stable
 
-ifdef BLISS_VERSION_MAINTENANCE
-    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
-else
+#ifdef BLISS_VERSION_MAINTENANCE
+#    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
+#else
     VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)
-endif
+#endif
 
 # Set BLISS_BUILDTYPE
 ifdef BLISS_NIGHTLY
@@ -17,9 +17,9 @@
 ifdef BLISS_EXPERIMENTAL
     BLISS_BUILDTYPE := EXPERIMENTAL
 endif
-ifdef BLISS_MAINTENANCE
-    BLISS_BUILDTYPE := MAINTENANCE
-endif
+#ifdef BLISS_MAINTENANCE
+#    BLISS_BUILDTYPE := MAINTENANCE
+#endif
 # Set Unofficial if no buildtype set (Buildtype should ONLY be set by BLISS Devs!)
 ifdef BLISS_BUILDTYPE
 else
@@ -38,4 +38,5 @@
 
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
   ro.bliss.version=$(BLISS_DISPLAY_VERSION) \
-  ro.bliss.build.status=$(BLISS_BUILDTYPE)
+  ro.bliss.build.status=$(BLISS_BUILDTYPE) \
+  ro.bliss.buildtype=$(BLISS_BUILDTYPE)