diff --git a/cat/wephone/BoardConfig.mk b/cat/wephone/BoardConfig.mk
index a21a922..a6b1f4f 100644
--- a/cat/wephone/BoardConfig.mk
+++ b/cat/wephone/BoardConfig.mk
@@ -1,24 +1,61 @@
-include build/make/target/board/BoardConfigGsiCommon.mk
+# BoardConfigMgsiCommon.mk
+#
+# Common compile-time definitions for MGSI
+# Builds upon the mainline config.
+#
 
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a-neon
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
+include build/make/target/board/BoardConfigMainlineCommon.mk
 
-# 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
+TARGET_NO_KERNEL := true
 
-# 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
+# This flag is set by mainline but isn't desired for MGSI.
+BOARD_USES_SYSTEM_OTHER_ODEX :=
 
-TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)
+# system.img is always ext4
+# MGSI also includes make_f2fs to support userdata parition in f2fs
+# for some devices
+TARGET_USERIMAGES_USE_F2FS := true
 
-ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+# Enable dynamic system image size and reserved 64MB in it.
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
+
+# MGSI forces product and system_ext packages to /system for now.
+TARGET_COPY_OUT_PRODUCT := system/product
+TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext
+
+# Creates metadata partition mount point under root for
+# the devices with metadata parition
+BOARD_USES_METADATA_PARTITION := true
+
+# Android Verified Boot (AVB):
+#   Set the rollback index to zero, to prevent the device bootloader from
+#   updating the last seen rollback index in the tamper-evident storage.
+BOARD_AVB_ROLLBACK_INDEX := 0
+
+# Enable chain partition for system.
+BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
+
+# MGSI specific System Properties
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+TARGET_SYSTEM_PROP := device/generic/common/mgsi/mgsi_system.prop
 else
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+TARGET_SYSTEM_PROP := device/generic/common/mgsi/mgsi_system_user.prop
 endif
+
+# Set this to create /cache mount point for non-A/B devices that mounts /cache.
+# The partition size doesn't matter, just to make build pass.
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216
+
+# Setup a vendor image to let PRODUCT_PROPERTY_OVERRIDES does not affect MGSI
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+
+# Disable 64 bit mediadrmserver
+TARGET_ENABLE_MEDIADRM_64 :=
+
+# Ordinary (non-flattened) APEX may require kernel changes. For maximum compatibility,
+# use flattened APEX for MGSI
+TARGET_FLATTEN_APEX := true