diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index ed7f76e..d1f71a5 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -7,3 +7,9 @@ endif
 
 TARGET_USES_64_BIT_BINDER := true
 BOARD_SYSTEMIMAGE_AS_SYSTEM := true
+
+# 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 :=