diff --git a/generate.sh b/generate.sh
index bb044bf..ad67928 100644
--- a/generate.sh
+++ b/generate.sh
@@ -9,7 +9,7 @@ echo 'PRODUCT_MAKEFILES := \' > AndroidProducts.mk
 
 for part in a ab;do
 	for apps in vanilla gapps foss;do
-		for arch in arm64;do
+		for arch in arm64 arm;do
 			for su in yes no;do
 				apps_suffix=""
 				apps_script=""
@@ -52,7 +52,7 @@ $apps_script
 $rom_script
 
 PRODUCT_NAME := $target
-PRODUCT_DEVICE := phhgsi_arm64_$part
+PRODUCT_DEVICE := phhgsi_${arch}_$part
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Phh-Treble $apps_name
 
diff --git a/phhgsi_arm_a/BoardConfig.mk b/phhgsi_arm_a/BoardConfig.mk
new file mode 100644
index 0000000..f70da88
--- /dev/null
+++ b/phhgsi_arm_a/BoardConfig.mk
@@ -0,0 +1,4 @@
+include build/make/target/board/generic_arm_a/BoardConfig.mk
+
+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
new file mode 100644
index 0000000..a9abaed
--- /dev/null
+++ b/phhgsi_arm_ab/BoardConfig.mk
@@ -0,0 +1,4 @@
+include build/make/target/board/generic_arm_ab/BoardConfig.mk
+
+TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth