diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk
index c6eccd3..31a5b76 100644
--- a/cat/cat_s22.mk
+++ b/cat/cat_s22.mk
@@ -38,6 +38,6 @@ PRODUCT_BUILD_SUPER_PARTITION := false
 PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
 
 PRODUCT_NAME := cat_s22
-PRODUCT_DEVICE := dummy_arm
+PRODUCT_DEVICE := s22
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := Minimal GSI on arm32
diff --git a/cat/wephone/BoardConfig.mk b/cat/s22/BoardConfig.mk
similarity index 100%
rename from cat/wephone/BoardConfig.mk
rename to cat/s22/BoardConfig.mk