diff --git a/gapps.mk b/gapps.mk
index 0605289..57dc612 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -6,6 +6,6 @@ GAPPS_FORCE_PIXEL_LAUNCHER := true
 
 $(call inherit-product-if-exists, vendor/opengapps/build/opengapps-packages.mk)
 
-ifneq ($(filter msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)
+#ifneq ($(filter msm8996 msm8998,$(TARGET_BOARD_PLATFORM)),)
 PRODUCT_PACKAGES += GoogleCam
-endif # msm8996 msm8998
+#endif # msm8996 msm8998
diff --git a/lineage-package_cache.rc b/lineage-package_cache.rc
new file mode 100644
index 0000000..86ab0a8
--- /dev/null
+++ b/lineage-package_cache.rc
@@ -0,0 +1,2 @@
+on post-fs-data
+    setprop pm.boot.disable_package_cache true
diff --git a/product.mk b/product.mk
index c20ae43..554ef5a 100644
--- a/product.mk
+++ b/product.mk
@@ -20,18 +20,24 @@ endif
 
 PRODUCT_PACKAGES += auditd
 
+# Disable package cache on all builds
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/lineage-package_cache.rc:system/etc/init/lineage-package_cache.rc
+
 PRODUCT_PROPERTY_OVERRIDES += ro.opa.eligible_device=true
 
 # Themes
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
-PRODUCT_PROPERTY_OVERRIDES += ro.boot.vendor.overlay.theme=com.google.android.theme.pixel
-PRODUCT_PROPERTY_OVERRIDES += ro.com.google.ime.theme_id=5
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.boot.vendor.overlay.theme=com.google.android.theme.pixel
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.com.google.ime.theme_id=5
 PRODUCT_PACKAGES += \
     PixelTheme
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.vc_call_vol_steps=7 \
     ro.config.media_vol_steps=18
 
 $(call prepend-product-if-exists, vendor/rashed/product.mk)
+ifneq ($(DISABLE_GAPPS),true)
 $(call prepend-product-if-exists, vendor/extra/gapps.mk)
+endif