diff --git a/configs/systemext-privapp-permissions-com.mediatek.ims.xml b/configs/privapp-permissions-com.mediatek.ims.xml
similarity index 100%
rename from configs/systemext-privapp-permissions-com.mediatek.ims.xml
rename to configs/privapp-permissions-com.mediatek.ims.xml
diff --git a/device.mk b/device.mk
index 496cb53..a6ac232 100644
--- a/device.mk
+++ b/device.mk
@@ -211,12 +211,10 @@ PRODUCT_PACKAGES += \
 
 # IMS
 PRODUCT_BOOT_JARS += \
-    mediatek-carrier-config-manager \
     mediatek-common \
     mediatek-framework \
     mediatek-ims-base \
     mediatek-ims-common \
-    mediatek-ims-extension-plugin \
     mediatek-telecom-common \
     mediatek-telephony-base \
     mediatek-telephony-common
@@ -226,7 +224,7 @@ PRODUCT_PACKAGES += \
     libshim_ui
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/systemext-privapp-permissions-com.mediatek.ims.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/systemext-privapp-permissions-com.mediatek.ims.xml
+    $(LOCAL_PATH)/configs/privapp-permissions-com.mediatek.ims.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-com.mediatek.ims.xml
 
 # Inherit several Android Go Configurations (Beneficial for everyone, even on non-Go devices)
 PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE := true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 74a7068..1248024 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -2373,49 +2373,36 @@ vendor/lib64/mt6789/libmnl.so
 vendor/lib64/librpc.so
 vendor/lib64/libviagpsrpc.so
 
-# IMS - from H0AMSI ROM'S
-system_ext/bin/vtservice
-system_ext/etc/init/init.vtservice.rc
-system_ext/framework/mediatek-carrier-config-manager.jar:system/framework/mediatek-carrier-config-manager.jar
-system_ext/framework/mediatek-common.jar:system/framework/mediatek-common.jar
-system_ext/framework/mediatek-framework.jar:system/framework/mediatek-framework.jar
-system_ext/framework/mediatek-ims-base.jar:system/framework/mediatek-ims-base.jar
-system_ext/framework/mediatek-ims-common.jar:system/framework/mediatek-ims-common.jar
-system_ext/framework/mediatek-ims-extension-plugin.jar:system/framework/mediatek-ims-extension-plugin.jar
-system_ext/framework/mediatek-telecom-common.jar:system/framework/mediatek-telecom-common.jar
-system_ext/framework/mediatek-telephony-base.jar:system/framework/mediatek-telephony-base.jar
-system_ext/framework/mediatek-telephony-common.jar:system/framework/mediatek-telephony-common.jar
-system_ext/lib/libmtk_vt_wrapper.so
-system_ext/lib/libmtkperf_client.so
-system_ext/lib/libvcodec_cap.so
-system_ext/lib/libvcodec_capenc.so
-system_ext/lib64/libcomutils.so
-system_ext/lib64/libimsma.so
-system_ext/lib64/libimsma_adapt.so
-system_ext/lib64/libimsma_rtp.so
-system_ext/lib64/libimsma_socketwrapper.so
-system_ext/lib64/libmtk_vt_service.so
-system_ext/lib64/libmtk_vt_wrapper.so
-system_ext/lib64/libmtkperf_client.so
-system_ext/lib64/libsignal.so
-system_ext/lib64/libsink.so
-system_ext/lib64/libsource.so
-system_ext/lib64/libvcodec_cap.so
-system_ext/lib64/libvcodec_capenc.so
-system_ext/lib64/libvt_avsync.so
+# IMS
+bin/vtservice
+etc/init/init.vtservice.rc
+-framework/mediatek-common.jar
+-framework/mediatek-framework.jar
+-framework/mediatek-ims-base.jar
+-framework/mediatek-ims-common.jar
+-framework/mediatek-ims-extension-plugin.jar
+-framework/mediatek-telecom-common.jar
+-framework/mediatek-telephony-base.jar
+-framework/mediatek-telephony-common.jar
+-framework/mediatek-wfo-legacy.jar
+lib64/libcomutils.so
+lib64/libimsma.so
+lib64/libimsma_adapt.so
+lib64/libimsma_rtp.so
+lib64/libimsma_socketwrapper.so
+lib64/libmtk_vt_service.so
+lib64/libmtk_vt_wrapper.so
+lib64/libmtkperf_client.so
+lib64/libsignal.so
+lib64/libsink.so
+lib64/libsource.so
+lib64/libvcodec_cap.so
+lib64/libvcodec_capenc.so
+lib64/libvsim-adaptor-client.so
+lib64/libvt_avsync.so
+-priv-app/ImsService/ImsService.apk
 system_ext/lib/vendor.mediatek.hardware.videotelephony@1.0.so
 system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so
-vendor/lib/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so
-vendor/lib/vendor.mediatek.hardware.rcs@2.0.so
-vendor/lib/vendor.mediatek.hardware.videotelephony@1.0.so
-vendor/lib64/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so
-vendor/lib64/vendor.mediatek.hardware.videotelephony@1.0.so
-system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so
-
-# IMS - from H0AMSI - Patched
-system_ext/priv-app/ImsService/ImsService.apk
-
-# IMS (Vendor)
 vendor/bin/hw/vendor.mediatek.hardware.mmagent@1.1-service
 vendor/bin/hw/vtservice_hidl
 vendor/bin/ipsec_mon