diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
index 9fa66e3..c020cd5 100644
--- a/cat/cat_s22.mk
+++ b/cat/cat_s22.mk
@@ -1,3 +1,4 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
diff --git a/cat/wephone/BoardConfig.mk b/cat/wephone/BoardConfig.mk
index de6654a..a21a922 100644
--- a/cat/wephone/BoardConfig.mk
+++ b/cat/wephone/BoardConfig.mk
@@ -13,7 +13,7 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
 
 # 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
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
 
 TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)