diff --git a/build/core/main_version.mk b/build/core/main_version.mk
index dc3e67d..999d94f 100644
--- a/build/core/main_version.mk
+++ b/build/core/main_version.mk
@@ -3,4 +3,5 @@
   ro.bliss.build.status=$(BLISS_BUILDTYPE) \
   ro.bliss.changelog.version=Changelog-$(BLISS_VERSION) \
   ro.bliss.fingerprint=$(BLISS_FINGERPRINT) \
-  ro.bliss.static.version=$(BLISS_VERSION_STATIC)
+  ro.bliss.static.version=$(BLISS_VERSION_STATIC) \
+  ro.bliss.build.variant=$(BLISS_BUILD_VARIANT)
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index f97a7c6..79d8873 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -3,13 +3,19 @@
     apns-conf.xml
 
 # AOSP packages
+ifeq ($(BLISS_BUILD_VARIANT), vanilla)
 PRODUCT_PACKAGES += \
+    Contacts \
+    Calendar \
+    DeskClock \
+    Dialer \
     Email \
     ExactCalculator \
     Exchange2 \
     LiveWallpapersPicker \
     messaging \
-    PhotoTable
+    WallpaperPicker2
+endif
 
 # Bliss Packages
 PRODUCT_PACKAGES += \
diff --git a/config/common.mk b/config/common.mk
index d803bc3..ee9f601 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -124,6 +124,13 @@
 # Bliss Versioning System
 -include vendor/bliss/config/versions.mk
 
+# Bliss Packages
 -include vendor/bliss/config/bliss_packages.mk
+
+# Gapps
+ifeq ($(BLISS_BUILD_VARIANT), gapps)
+$(call inherit-product, vendor/gapps/common/common-vendor.mk)
+endif
+
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
 -include vendor/bliss/config/partner_gms.mk
diff --git a/config/telephony.mk b/config/telephony.mk
index a309e70..d65f916 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -8,7 +8,6 @@
 
 # Telephony packages
 PRODUCT_PACKAGES += \
-    messaging \
     Stk \
     CellBroadcastReceiver
 
diff --git a/config/versions.mk b/config/versions.mk
index 7ebe7db..4ee29b6 100644
--- a/config/versions.mk
+++ b/config/versions.mk
@@ -7,6 +7,9 @@
 # Bliss Android version
 BLISS_VERSION_STATIC = 11.0
 
+# Set Bliss Build Variant
+BLISS_BUILD_VARIANT ?= gapps
+
 #ifdef BLISS_VERSION_MAINTENANCE
 #    VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)-$(BLISS_VERSION_MAINTENANCE)
 #else
@@ -35,7 +38,7 @@
 ifdef BLISS_RELEASE
     BLISS_VERSION := Bliss-v$(VERSION)
 else
-    BLISS_VERSION := Bliss-v$(VERSION)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(shell date +%Y%m%d)
+    BLISS_VERSION := Bliss-v$(VERSION)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(BLISS_BUILD_VARIANT)-$(shell date +%Y%m%d)
 endif
 
 BLISS_DISPLAY_VERSION := $(VERSION)