diff --git a/aoc/aoc.mk b/aoc/aoc.mk
index 136bb42..d103ee9 100644
--- a/aoc/aoc.mk
+++ b/aoc/aoc.mk
@@ -4,7 +4,7 @@ PRODUCT_PACKAGES += dump_aoc \
 		    aocd \
 		    aocxd
 
-ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
+ifeq (,$(filter aosp_% lineage_%,$(TARGET_PRODUCT)))
 # IAudioMetricExt HIDL
 PRODUCT_PACKAGES += \
     vendor.google.audiometricext@1.0-service-vendor
diff --git a/betterbug/betterbug.mk b/betterbug/betterbug.mk
index 906933d..c4f4fce 100644
--- a/betterbug/betterbug.mk
+++ b/betterbug/betterbug.mk
@@ -1,5 +1,5 @@
 # When neither AOSP nor factory targets
-ifeq (,$(filter aosp_% factory_%, $(TARGET_PRODUCT)))
+ifeq (,$(filter aosp_% factory_% lineage_%, $(TARGET_PRODUCT)))
   PRODUCT_PACKAGES += BetterBugStub
   PRODUCT_PACKAGES_DEBUG += BetterBug
 endif
diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk
index 8a6bb10..daad1f6 100644
--- a/gyotaku_app/gyotaku.mk
+++ b/gyotaku_app/gyotaku.mk
@@ -1,5 +1,5 @@
 ifneq ($(TARGET_BUILD_VARIANT), user)
-  ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) # Skip aosp target product
+  ifeq (,$(filter aosp_% lineage_%, $(TARGET_PRODUCT))) # Skip aosp target product
     PRODUCT_PACKAGES_DEBUG += \
       Gyotaku
 
diff --git a/ramdump_and_coredump/ramdump_and_coredump.mk b/ramdump_and_coredump/ramdump_and_coredump.mk
index d7a819f..c50aeb6 100644
--- a/ramdump_and_coredump/ramdump_and_coredump.mk
+++ b/ramdump_and_coredump/ramdump_and_coredump.mk
@@ -6,7 +6,7 @@ PRODUCT_PACKAGES_DEBUG += \
     ramdump \
 
 # When neither AOSP nor factory targets
-ifeq (,$(filter aosp_% factory_%, $(TARGET_PRODUCT)))
+ifeq (,$(filter aosp_% factory_% lineage_%, $(TARGET_PRODUCT)))
   PRODUCT_PACKAGES += SSRestartDetector
   PRODUCT_PACKAGES_DEBUG += RamdumpUploader
 endif