diff --git a/build/gapps.sh b/build/gapps.sh
index 15dea65..57e5163 100755
--- a/build/gapps.sh
+++ b/build/gapps.sh
@@ -8,8 +8,8 @@
 #
 DATE=$(date -u +%Y%m%d_%H%M%S)
 TOP=$(realpath .)
-ANDROIDV=12.0.0
-SDKV=31
+ANDROIDV=12.1.0
+SDKV=32
 GARCH=$1
 CPUARCH=$GARCH
 [ ! -z "$2" ] && CPUARCH=$2
diff --git a/build/target/product/lineage_gapps_arm.mk b/build/target/product/lineage_gapps_arm.mk
index d6adae7..85e5d0d 100644
--- a/build/target/product/lineage_gapps_arm.mk
+++ b/build/target/product/lineage_gapps_arm.mk
@@ -1,4 +1,8 @@
-include vendor/lineage/build/target/product/lineage_arm.mk
+$(call inherit-product, build/target/product/aosp_arm.mk)
+
+include vendor/lineage/build/target/product/lineage_generic_target.mk
+
+TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_NAME := lineage_gapps_arm
 
diff --git a/build/target/product/lineage_gapps_arm64.mk b/build/target/product/lineage_gapps_arm64.mk
index 3f8ad93..b097611 100644
--- a/build/target/product/lineage_gapps_arm64.mk
+++ b/build/target/product/lineage_gapps_arm64.mk
@@ -1,4 +1,8 @@
-include vendor/lineage/build/target/product/lineage_arm64.mk
+$(call inherit-product, build/target/product/aosp_arm64.mk)
+
+include vendor/lineage/build/target/product/lineage_generic_target.mk
+
+TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_NAME := lineage_gapps_arm64
 
diff --git a/build/target/product/lineage_gapps_x86.mk b/build/target/product/lineage_gapps_x86.mk
index d555e86..1003d08 100644
--- a/build/target/product/lineage_gapps_x86.mk
+++ b/build/target/product/lineage_gapps_x86.mk
@@ -1,9 +1,12 @@
-include vendor/lineage/build/target/product/lineage_x86.mk
+$(call inherit-product, build/target/product/aosp_x86.mk)
 
-PRODUCT_NAME := lineage_gapps_x86
+include vendor/lineage/build/target/product/lineage_generic_target.mk
 
 PRODUCT_SDK_ADDON_NAME :=
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP :=
+
 TARGET_NO_KERNEL_OVERRIDE := true
 
+PRODUCT_NAME := lineage_gapps_x86
+
 PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay
diff --git a/build/target/product/lineage_gapps_x86_64.mk b/build/target/product/lineage_gapps_x86_64.mk
index dcd31ab..fc256d9 100644
--- a/build/target/product/lineage_gapps_x86_64.mk
+++ b/build/target/product/lineage_gapps_x86_64.mk
@@ -1,9 +1,12 @@
-include vendor/lineage/build/target/product/lineage_x86_64.mk
+$(call inherit-product, build/target/product/aosp_x86_64.mk)
 
-PRODUCT_NAME := lineage_gapps_x86_64
+include vendor/lineage/build/target/product/lineage_generic_target.mk
+
+TARGET_NO_KERNEL_OVERRIDE := true
 
 PRODUCT_SDK_ADDON_NAME :=
 PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP :=
-TARGET_NO_KERNEL_OVERRIDE := true
+
+PRODUCT_NAME := lineage_gapps_x86_64
 
 PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay