diff --git a/board-base.mk b/board-base.mk
new file mode 100644
index 0000000..c9cb49a
--- /dev/null
+++ b/board-base.mk
@@ -0,0 +1,2 @@
+TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth
diff --git a/phhgsi_arm64_a/BoardConfig.mk b/phhgsi_arm64_a/BoardConfig.mk
index 2cd43c5..1c16774 100644
--- a/phhgsi_arm64_a/BoardConfig.mk
+++ b/phhgsi_arm64_a/BoardConfig.mk
@@ -1,5 +1,4 @@
 include build/make/target/board/generic_arm64_a/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
-TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth
diff --git a/phhgsi_arm64_ab/BoardConfig.mk b/phhgsi_arm64_ab/BoardConfig.mk
index 96b7b98..612ff3e 100644
--- a/phhgsi_arm64_ab/BoardConfig.mk
+++ b/phhgsi_arm64_ab/BoardConfig.mk
@@ -1,5 +1,4 @@
 include build/make/target/board/generic_arm64_ab/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
-TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth
diff --git a/phhgsi_arm_a/BoardConfig.mk b/phhgsi_arm_a/BoardConfig.mk
index aeae535..6b72ea3 100644
--- a/phhgsi_arm_a/BoardConfig.mk
+++ b/phhgsi_arm_a/BoardConfig.mk
@@ -1,5 +1,4 @@
 include build/make/target/board/generic_arm_a/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
-TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth
diff --git a/phhgsi_arm_ab/BoardConfig.mk b/phhgsi_arm_ab/BoardConfig.mk
index 8c04d7e..1df6cd1 100644
--- a/phhgsi_arm_ab/BoardConfig.mk
+++ b/phhgsi_arm_ab/BoardConfig.mk
@@ -1,5 +1,4 @@
 include build/make/target/board/generic_arm_ab/BoardConfig.mk
+include device/phh/treble/board-base.mk
 
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
-TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth