diff --git a/build/core/main_version.mk b/build/core/main_version.mk
index bb6314c1..04128aba 100644
--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
@@ -3,11 +3,3 @@
 #ADDITIONAL_SYSTEM_PROPERTIES += \
 #    ro.build.fingerprint=$(BUILD_FINGERPRINT)
 #endif
-
-# tequilaOS System Version
-#ADDITIONAL_SYSTEM_PROPERTIES += \
-#    ro.tequila.version=$(TEQUILA_VERSION) \
-#    ro.tequila.releasetype=$(TEQUILA_BUILDTYPE) \
-#    ro.tequila.build.version=$(TEQUILA_PLATFORM_VERSION) \
-#    ro.tequila.display.version=$(TEQUILA_DISPLAY_VERSION) \
-#    ro.modversion=$(TEQUILA_VERSION) \
diff --git a/config/version.mk b/config/version.mk
index 99a0094c..023db051 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -14,3 +14,11 @@ TEQUILA_VERSION := $(TEQUILA_PLATFORM_VERSION)-$(TEQUILA_VERSION_SUFFIX)-$(TEQUI
 
 # Display version
 TEQUILA_DISPLAY_VERSION := $(TEQUILA_PLATFORM_VERSION)-$(TEQUILA_VERSION_SUFFIX)
+
+# tequilaOS version properties
+PRODUCT_SYSTEM_PROPERTIES += \
+    ro.tequila.version=$(TEQUILA_VERSION) \
+    ro.tequila.display.version=$(TEUQILA_DISPLAY_VERSION) \
+	ro.tequila.build.version=$(TEQUILA_PLATFORM_VERSION) \
+    ro.tequila.releasetype=$(TEQUILA_BUILDTYPE) \
+    ro.modversion=$(TEQUILA_VERSION)