diff --git a/build/target/product/lineage_gsi_arm.mk b/build/target/product/lineage_gsi_arm.mk
index df7e7b30..bf414e2c 100644
--- a/build/target/product/lineage_gsi_arm.mk
+++ b/build/target/product/lineage_gsi_arm.mk
@@ -14,6 +14,8 @@
 
 $(call inherit-product, device/generic/common/gsi_arm.mk)
 
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
 include vendor/lineage/build/target/product/lineage_generic_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
@@ -21,3 +23,5 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_NAME := lineage_gsi_arm
+
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
diff --git a/build/target/product/lineage_gsi_arm64.mk b/build/target/product/lineage_gsi_arm64.mk
index 1cf5ee93..d9aa4a6e 100644
--- a/build/target/product/lineage_gsi_arm64.mk
+++ b/build/target/product/lineage_gsi_arm64.mk
@@ -14,6 +14,8 @@
 
 $(call inherit-product, device/generic/common/gsi_arm64.mk)
 
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+
 include vendor/lineage/build/target/product/lineage_generic_target.mk
 
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
@@ -21,3 +23,6 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
 TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_NAME := lineage_gsi_arm64
+PRODUCT_DEVICE := generic_arm64
+
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=