diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
index e87a6ae..16f6c40 100644
--- a/cat/cat_s22.mk
+++ b/cat/cat_s22.mk
@@ -9,7 +9,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
 
 
 # Enable mainline checking
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
 
 #
 # All components inherited here go to product image
@@ -21,8 +21,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
 
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/wephone/cat/sepolicy
-
 # Don't build super.img.
 PRODUCT_BUILD_SUPER_PARTITION := false
 
@@ -34,3 +32,21 @@ PRODUCT_MODEL := wePhone Cat S22
 PRODUCT_CHARACTERISTICS := device
 
 PRODUCT_PACKAGE_OVERLAYS += device/wephone/cat/overlay
+
+PRODUCT_PACKAGES += \
+    BromiteSystemWebView \
+    Conversations \
+    Davx5 \
+    Etar \
+    ExactCalculator \
+    DeskClock \
+    FDroid \
+    Linphone \
+    Nextcloud \
+    Wireguard
+
+PRODUCT_PACKAGES -= \
+    EasterEgg \
+    webview \
+    libwebviewchromium_loader \
+    libwebviewchromium_plat_support