diff --git a/config/version.mk b/config/version.mk
index c5583fa..07a68f2 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -8,8 +8,12 @@
 TARGET_PRODUCT_SHORT := $(subst omni_,,$(TARGET_PRODUCT_SHORT))
 
 # Build the final version string
-ifdef BUILDTYPE_RELEASE
-    ROM_VERSION := $(PLATFORM_VERSION)-$(TARGET_PRODUCT_SHORT)
+ifeq ($(ROM_BUILDTYPE),GAPPS)
+include vendor/gapps/config.mk
+    VENDOR_EXCEPTION_PATHS += \
+    gapps
+
+    ROM_VERSION := $(PLATFORM_VERSION)-$(shell date +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)
 else
 ifeq ($(ROM_BUILDTIME_UTC),y)
     ROM_VERSION := $(PLATFORM_VERSION)-$(shell date -u +%Y%m%d)-$(TARGET_PRODUCT_SHORT)-$(ROM_BUILDTYPE)