diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk
index f971301..6643a4d 100644
--- a/cat/cat_s22/BoardConfig.mk
+++ b/cat/cat_s22/BoardConfig.mk
@@ -1,16 +1,10 @@
 include build/make/target/board/BoardConfigGsiCommon.mk
 
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armvi8-a
 TARGET_CPU_VARIANT := generic
-
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-a
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
+TARGET_CPU_ABI := armeabi-v8a
+TARGET_CPU_ABI2 := armeabi
 
 # TODO(b/111434759, b/111287060) SoC specific hacks
 BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
@@ -21,7 +15,7 @@ BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
 # no longer has QCOM-specific directories under /.
 BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
 
-TARGET_ENABLE_MEDIADRM_64 :=
+#TARGET_ENABLE_MEDIADRM_64 :=
 
 TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)