diff --git a/Android.bp b/Android.bp
index b8ff94b..567b5b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,25 +5,6 @@
 soong_namespace {
 }
 
-cc_prebuilt_library_shared {
-	name: "libem_support_jni",
-	owner: "realme",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/lib/libem_support_jni.so"],
-		},
-		android_arm64: {
-			srcs: ["proprietary/lib64/libem_support_jni.so"],
-		},
-	},
-	compile_multilib: "both",
-	check_elf_files: false,
-	prefer: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libaptXHD_encoder",
 	owner: "realme",
@@ -14646,6 +14627,26 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "libem_support_jni",
+	owner: "realme",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/system_ext/lib/libem_support_jni.so"],
+		},
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/libem_support_jni.so"],
+		},
+	},
+	compile_multilib: "both",
+	check_elf_files: false,
+	prefer: true,
+	system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
 	name: "libcomutils",
 	owner: "realme",
@@ -15073,17 +15074,6 @@ cc_prebuilt_library_shared {
 	device_specific: true,
 }
 
-android_app_import {
-	name: "EngineerMode",
-	owner: "realme",
-	apk: "proprietary/priv-app/EngineerMode/EngineerMode.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-}
-
 android_app_import {
 	name: "ImsService",
 	owner: "realme",
@@ -15107,6 +15097,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "EngineerMode",
+	owner: "realme",
+	apk: "proprietary/system_ext/app/EngineerMode/EngineerMode.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "mediatek-common",
 	owner: "realme",
diff --git a/RM6785-common-vendor.mk b/RM6785-common-vendor.mk
index badb3ea..aacbe46 100644
--- a/RM6785-common-vendor.mk
+++ b/RM6785-common-vendor.mk
@@ -799,7 +799,6 @@ PRODUCT_COPY_FILES += \
     vendor/realme/RM6785-common/proprietary/vendor/lib/egl/egl.cfg:$(TARGET_COPY_OUT_VENDOR)/lib/egl/egl.cfg
 
 PRODUCT_PACKAGES += \
-    libem_support_jni \
     libaptXHD_encoder \
     libaptX_encoder \
     arm.graphics-V1-ndk_platform \
@@ -1643,6 +1642,7 @@ PRODUCT_PACKAGES += \
     vendor.trustonic.tee.tui@1.0 \
     vendor.trustonic.tee@1.0 \
     vendor.trustonic.tee@1.1 \
+    libem_support_jni \
     libcomutils \
     libimsma \
     libimsma_adapt \
@@ -1668,9 +1668,9 @@ PRODUCT_PACKAGES += \
     vendor.oplus.hardware.commondcs@1.0 \
     vendor.oplus.hardware.orms@1.0 \
     vendor.oplus.hardware.radio@1.0 \
-    EngineerMode \
     ImsService \
     HotwordEnrollmentOKGoogleCORTEXM4 \
+    EngineerMode \
     mediatek-common \
     mediatek-framework \
     mediatek-ims-base \
diff --git a/proprietary/lib/libem_support_jni.so b/proprietary/lib/libem_support_jni.so
deleted file mode 100644
index 6c95bdb..0000000
Binary files a/proprietary/lib/libem_support_jni.so and /dev/null differ
diff --git a/proprietary/lib64/libem_support_jni.so b/proprietary/lib64/libem_support_jni.so
deleted file mode 100644
index a6814eb..0000000
Binary files a/proprietary/lib64/libem_support_jni.so and /dev/null differ
diff --git a/proprietary/priv-app/EngineerMode/EngineerMode.apk b/proprietary/priv-app/EngineerMode/EngineerMode.apk
deleted file mode 100644
index 713e82a..0000000
Binary files a/proprietary/priv-app/EngineerMode/EngineerMode.apk and /dev/null differ
diff --git a/proprietary/system_ext/app/EngineerMode/EngineerMode.apk b/proprietary/system_ext/app/EngineerMode/EngineerMode.apk
new file mode 100644
index 0000000..a4be1d5
Binary files /dev/null and b/proprietary/system_ext/app/EngineerMode/EngineerMode.apk differ
diff --git a/proprietary/system_ext/lib/libem_support_jni.so b/proprietary/system_ext/lib/libem_support_jni.so
new file mode 100644
index 0000000..a047754
Binary files /dev/null and b/proprietary/system_ext/lib/libem_support_jni.so differ
diff --git a/proprietary/system_ext/lib64/libem_support_jni.so b/proprietary/system_ext/lib64/libem_support_jni.so
new file mode 100644
index 0000000..ced9407
Binary files /dev/null and b/proprietary/system_ext/lib64/libem_support_jni.so differ
diff --git a/proprietary/vendor/bin/em_hidl b/proprietary/vendor/bin/em_hidl
index 4af80f7..f3182e8 100755
Binary files a/proprietary/vendor/bin/em_hidl and b/proprietary/vendor/bin/em_hidl differ
diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.0.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.0.so
index a52cdb0..0ffd01e 100644
Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.0.so and b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.0.so differ
diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.1.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.1.so
index f5c7e0e..f079f80 100644
Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.1.so and b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.1.so differ
diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.2.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.2.so
index a7833b4..6bd5e9a 100644
Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.2.so and b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.2.so differ
diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.3.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.3.so
index dac0872..1a19c43 100644
Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.3.so and b/proprietary/vendor/lib64/vendor.mediatek.hardware.engineermode@1.3.so differ