diff --git a/jelly_star/jelly_star.mk b/jelly_star/jelly_star.mk
index 4bf1a92..73c211e 100644
--- a/jelly_star/jelly_star.mk
+++ b/jelly_star/jelly_star.mk
@@ -1,9 +1,11 @@
-include device/generic/common/gsi_arm64.mk
+TARGET_GAPPS_ARCH := arm64
+
+include build/make/target/product/aosp_arm.mk
+include build/make/target/product/gsi_release.mk
 
 PRODUCT_NAME := gsi_arm64
 PRODUCT_DEVICE := jelly_star
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := GSI on ARM64
 
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
-QSB_ON_FIRST_SCREEN := false
+PRODUCT_CHARACTERISTICS := device