diff --git a/cat/AndroidProducts.mk b/cat/AndroidProducts.mk
new file mode 100644
index 0000000..71ecae1
--- /dev/null
+++ b/cat/AndroidProducts.mk
@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/cat_s22.mk
diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
new file mode 100644
index 0000000..29d030b
--- /dev/null
+++ b/cat/cat_s22.mk
@@ -0,0 +1,24 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
+
+# Enable mainline checking
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+
+#
+# All components inherited here go to product image
+#
+$(call inherit-product, device/generic/common/mgsi/mgsi_product.mk)
+
+#
+# Special settings for GSI releasing
+#
+$(call inherit-product, device/generic/common/mgsi/mgsi_release.mk)
+
+# Don't build super.img.
+PRODUCT_BUILD_SUPER_PARTITION := false
+
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+
+PRODUCT_NAME := mgsi_arm
+PRODUCT_DEVICE := dummy_arm
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Minimal GSI on arm32