diff --git a/duoqin/board-base.mk b/duoqin/board-base.mk
new file mode 100644
index 0000000..2fbf948
--- /dev/null
+++ b/duoqin/board-base.mk
@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)
diff --git a/duoqin/duoqin/BoardConfig.mk b/duoqin/duoqin/BoardConfig.mk
index a95fc77..d987213 100644
--- a/duoqin/duoqin/BoardConfig.mk
+++ b/duoqin/duoqin/BoardConfig.mk
@@ -1,28 +1,5 @@
-include build/make/target/board/BoardConfigGsiCommon.mk
-
-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
-
-# TODO(b/111434759, b/111287060) SoC specific hacks
-BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
-BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
-BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
-
-# 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_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)
+include build/make/target/board/generic_arm64_ab/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648