diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
index 31a5b76..19c8cb0 100644
--- a/cat/cat_s22.mk
+++ b/cat/cat_s22.mk
@@ -17,6 +17,7 @@
 #
 # All components inherited here go to system image
 #
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
@@ -38,6 +39,6 @@ PRODUCT_BUILD_SUPER_PARTITION := false
 PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
 
 PRODUCT_NAME := cat_s22
-PRODUCT_DEVICE := s22
+PRODUCT_DEVICE := cat_s22
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Minimal GSI on arm32
diff --git a/cat/s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
similarity index 100%
rename from cat/s22/BoardConfig.mk
rename to cat/cat_s22/BoardConfig.mk