diff --git a/jelly_star/jelly_star.mk b/jelly_star/jelly_star.mk
index b432de2..4bf1a92 100644
--- a/jelly_star/jelly_star.mk
+++ b/jelly_star/jelly_star.mk
@@ -1,26 +1,9 @@
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
-
-# Enable mainline checking
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, device/generic/common/gsi_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, device/generic/common/gsi_product.mk)
-
-#
-# Special settings for GSI releasing
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
+include device/generic/common/gsi_arm64.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
diff --git a/jelly_star/jelly_star/BoardConfig.mk b/jelly_star/jelly_star/BoardConfig.mk
index 13729d4..3cbb176 100644
--- a/jelly_star/jelly_star/BoardConfig.mk
+++ b/jelly_star/jelly_star/BoardConfig.mk
@@ -1,30 +1 @@
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-a
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
-
-TARGET_DYNAMIC_64_32_MEDIASERVER := true
-
-include build/make/target/board/BoardConfigGsiCommon.mk
-
-BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
-BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
-BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
-
-BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
-
-#TARGET_EXFAT_DRIVER := exfat
-#TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
-
-#ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-#BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-#else
-#BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
-#endif
+include build/make/target/board/generic_arm64/BoardConfig.mk