diff --git a/config/common.mk b/config/common.mk
index fe35862..0dcd256 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -113,9 +113,6 @@
 # Include AOSP audio files
 include vendor/bliss/config/aosp_audio.mk
 
-# Include Bliss audio files
-include vendor/bliss/config/bliss_audio.mk
-
 ifneq ($(TARGET_DISABLE_LINEAGE_SDK), true)
 # Lineage SDK
 include vendor/bliss/config/lineage_sdk_common.mk
@@ -158,8 +155,12 @@
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     media.recorder.show_manufacturer_and_model=true
 
+# Overlays
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/bliss/overlay
 DEVICE_PACKAGE_OVERLAYS += vendor/bliss/overlay/common
 
+# Bliss Versioning System
+-include vendor/bliss/config/versions.mk
+
 -include vendor/bliss/config/misc_packages.mk
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
diff --git a/config/versions.mk b/config/versions.mk
new file mode 100644
index 0000000..8b4e747
--- /dev/null
+++ b/config/versions.mk
@@ -0,0 +1,43 @@
+# Versioning System For Bliss
+# Bliss RELEASE VERSION
+BLISS_VERSION_MAJOR = 11
+BLISS_VERSION_MINOR = 9
+# BLISS_VERSION_MAINTENANCE = Stable
+
+#ifdef BLISS_VERSION_MAINTENANCE
+#    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
+#else
+    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)
+#endif
+
+# Set BLISS_BUILDTYPE
+ifdef BLISS_NIGHTLY
+    BLISS_BUILDTYPE := NIGHTLY
+endif
+ifdef BLISS_EXPERIMENTAL
+    BLISS_BUILDTYPE := EXPERIMENTAL
+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
+    BLISS_BUILDTYPE := UNOFFICIAL
+endif
+
+# Set BLISS version
+ifdef BLISS_RELEASE
+    BLISS_VERSION := Bliss-v$(VERSION)
+else
+    BLISS_VERSION := Bliss-v$(VERSION)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(shell date +%Y%m%d)
+endif
+
+BLISS_DISPLAY_VERSION := $(VERSION)
+BLISS_DISPLAY_BUILDTYPE := $(BLISS_BUILDTYPE)
+
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+  ro.bliss.version=$(BLISS_DISPLAY_VERSION) \
+  ro.bliss.build.status=$(BLISS_BUILDTYPE) \
+  ro.bliss.releasetype=$(BLISS_BUILDTYPE) \
+  ro.bliss.changelog.version=Changelog-$(BLISS_VERSION)