diff --git a/phhgsi_a64_a/BoardConfig.mk b/phhgsi_a64_a/BoardConfig.mk
index 228e190..d430bf8 100644
--- a/phhgsi_a64_a/BoardConfig.mk
+++ b/phhgsi_a64_a/BoardConfig.mk
@@ -1,7 +1,8 @@
-include build/make/target/board/generic_arm_a/BoardConfig.mk
+include build/make/target/board/generic_arm_ab/BoardConfig.mk
 include device/phh/treble/board-base.mk
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
 endif
 TARGET_USES_64_BIT_BINDER := true
+BOARD_SYSTEMIMAGE_AS_SYSTEM := true
diff --git a/phhgsi_arm64_a/BoardConfig.mk b/phhgsi_arm64_a/BoardConfig.mk
index 2b6943c..c9bc831 100644
--- a/phhgsi_arm64_a/BoardConfig.mk
+++ b/phhgsi_arm64_a/BoardConfig.mk
@@ -1,6 +1,7 @@
-include build/make/target/board/generic_arm64_a/BoardConfig.mk
+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 := 2080374784
 endif
+BOARD_SYSTEMIMAGE_AS_SYSTEM := true
diff --git a/phhgsi_arm_a/BoardConfig.mk b/phhgsi_arm_a/BoardConfig.mk
index 76ae56f..36a8bf4 100644
--- a/phhgsi_arm_a/BoardConfig.mk
+++ b/phhgsi_arm_a/BoardConfig.mk
@@ -1,4 +1,4 @@
-include build/make/target/board/generic_arm_a/BoardConfig.mk
+include build/make/target/board/generic_arm_ab/BoardConfig.mk
 include device/phh/treble/board-base.mk
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
@@ -6,3 +6,4 @@ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1313583104
 endif
 
 TARGET_USES_64_BIT_BINDER := false
+BOARD_SYSTEMIMAGE_AS_SYSTEM := true