diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index 5e6e7ec..891000a 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -15,15 +15,15 @@ include build/make/target/board/BoardConfigMainlineCommon.mk
 TARGET_NO_KERNEL := true
 
 # This flag is set by mainline but isn't desired for MGSI.
-BOARD_USES_SYSTEM_OTHER_ODEX :=
+#BOARD_USES_SYSTEM_OTHER_ODEX :=
 
 # system.img is always ext4
 # MGSI also includes make_f2fs to support userdata parition in f2fs
 # for some devices
-TARGET_USERIMAGES_USE_F2FS := true
+#TARGET_USERIMAGES_USE_F2FS := true
 
 # Enable dynamic system image size and reserved 64MB in it.
-BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
+#BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
 
 # MGSI forces product and system_ext packages to /system for now.
 TARGET_COPY_OUT_PRODUCT := system/product
@@ -45,11 +45,11 @@ 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
-TARGET_SYSTEM_PROP := device/generic/common/mgsi/mgsi_system_user.prop
-endif
+#ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+#TARGET_SYSTEM_PROP := device/generic/common/mgsi/mgsi_system.prop
+#else
+#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.
@@ -65,3 +65,11 @@ TARGET_ENABLE_MEDIADRM_64 :=
 # Ordinary (non-flattened) APEX may require kernel changes. For maximum compatibility,
 # use flattened APEX for MGSI
 TARGET_FLATTEN_APEX := true
+
+TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif