diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
index c020cd5..5068311 100644
--- a/cat/cat_s22.mk
+++ b/cat/cat_s22.mk
@@ -1,4 +1,22 @@
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
+#
+# Copyright 2019 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# All components inherited here go to system image
+#
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
@@ -19,7 +37,7 @@ PRODUCT_BUILD_SUPER_PARTITION := false
 
 PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
 
-PRODUCT_NAME := cat_s22
-PRODUCT_DEVICE := wephone
+PRODUCT_NAME := mgsi_arm
+PRODUCT_DEVICE := dummy_arm
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Minimal GSI on arm32