diff --git a/qinf22pro/qinf22pro.mk b/qinf22pro/qinf22pro.mk
index acd0e6b..d208381 100644
--- a/qinf22pro/qinf22pro.mk
+++ b/qinf22pro/qinf22pro.mk
@@ -1,7 +1,6 @@
 TARGET_GAPPS_ARCH := arm64
 
-include build/make/target/product/aosp_arm64.mk
-include build/make/target/product/gsi_release.mk
+include device/generic/common/gsi_arm64.mk
 
 PRODUCT_NAME := qinf22pro
 PRODUCT_DEVICE := qinf22pro
@@ -12,3 +11,31 @@ PRODUCT_MODEL := weOs | v14.0.1 | Nehemiah
 PRODUCT_CHARACTERISTICS := device
 
 PRODUCT_PACKAGE_OVERLAYS += device/wephone/qinf22pro/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/qinf22pro/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/qinf22pro/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
+	device/wephone/qinf22pro/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl
+
+PRODUCT_PACKAGES += \
+	BromiteSystemWebView \
+	Conversations \
+	Davx5 \
+	DeskClock \
+	Etar \
+	ExactCalculator \
+	Gallery2 \
+	K-9Mail \
+	Linphone \
+	Nextcloud \
+	NextcloudNotes \
+	OpenDocumentReader \
+	Wireguard
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support \
+	CtsShimPrebuilt \
+	CtsShimPrivPrebuilt