diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
index 65b8f25..e87a6ae 100644
--- a/cat/cat_s22.mk
+++ b/cat/cat_s22.mk
@@ -9,13 +9,12 @@ $(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
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
-#$(call inherit-product, device/generic/common/mgsi/mgsi_product.mk)
 
 #
 # Special settings for GSI releasing
@@ -25,14 +24,12 @@ $(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
-
-#PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+PRODUCT_BUILD_SUPER_PARTITION := false
 
 PRODUCT_NAME := cat_s22
 PRODUCT_DEVICE := cat_s22
 PRODUCT_BRAND := Android
-PRODUCT_MODEL := Minimal GSI on arm32
+PRODUCT_MODEL := wePhone Cat S22
 
 PRODUCT_CHARACTERISTICS := device