diff --git a/jelly_star/jelly_star.mk b/jelly_star/jelly_star.mk
index ea96bce..77c29bd 100644
--- a/jelly_star/jelly_star.mk
+++ b/jelly_star/jelly_star.mk
@@ -1,26 +1,50 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
+
+#
+# All components inherited here go to system_ext image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
+
+#
+# All components inherited here go to product image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
+
+#
+# Special settings for GSI releasing
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
 
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
-MODULE_BUILD_FROM_SOURCE := true
 PRODUCT_CHARACTERISTICS := device
 
-$(call inherit-product, device/generic/common/gsi_system_ext.mk)
-$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
-$(call inherit-product, device/generic/common/gsi_product.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+PRODUCT_NAME := jelly_star
+PRODUCT_DEVICE := jelly_star
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on Unihertz Jelly Star
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
 
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/jelly_star/overlay
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
 
+# Use a more decent APN config
 PRODUCT_COPY_FILES += \
 	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 
+ifneq (,$(wildcard external/exfat))
 PRODUCT_PACKAGES += \
-	Contacts \
-	Etar \
-	TrichromeWebView
+	mkfs.exfat \
+	fsck.exfat
+endif
 
-PRODUCT_NAME := jelly_star
-PRODUCT_DEVICE := generic_arm64
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := GSI on ARM64
+PRODUCT_PACKAGES += \
+	TrichromeWebView 
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support
diff --git a/jelly_star/jelly_star/BoardConfig.mk b/jelly_star/jelly_star/BoardConfig.mk
index ac67428..fb830a4 100644
--- a/jelly_star/jelly_star/BoardConfig.mk
+++ b/jelly_star/jelly_star/BoardConfig.mk
@@ -1,3 +1,29 @@
-include build/make/target/board/generic_arm64/BoardConfig.mk
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
 
-TARGET_SYSTEM_PROP := device/wephone/jelly_star/system.prop $(TARGET_SYSTEM_PROP)
+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
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+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
\ No newline at end of file