diff --git a/Android.bp b/Android.bp
index 055973d..cd564a9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -645,14 +645,14 @@
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.samsung.hardware.radio.bridge@2.0",
+	name: "vendor.samsung.hardware.radio-V1-ndk",
 	owner: "samsung",
 	strip: {
 		none: true,
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so"],
+			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so"],
 		},
 	},
 	compile_multilib: "64",
@@ -662,14 +662,14 @@
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.samsung.hardware.radio.bridge@2.1",
+	name: "vendor.samsung.hardware.radio.bridge-V1-ndk",
 	owner: "samsung",
 	strip: {
 		none: true,
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so"],
+			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so"],
 		},
 	},
 	compile_multilib: "64",
@@ -679,14 +679,65 @@
 }
 
 cc_prebuilt_library_shared {
-	name: "vendor.samsung.hardware.radio.channel@2.0",
+	name: "vendor.samsung.hardware.radio.channel-V1-ndk",
 	owner: "samsung",
 	strip: {
 		none: true,
 	},
 	target: {
 		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so"],
+			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.samsung.hardware.radio.data-V1-ndk",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.samsung.hardware.radio.messaging-V1-ndk",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "vendor.samsung.hardware.radio.sim-V1-ndk",
+	owner: "samsung",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so"],
 		},
 	},
 	compile_multilib: "64",
@@ -704,6 +755,33 @@
 	soc_specific: true,
 }
 
+prebuilt_etc_xml {
+	name: "vendor.samsung.hardware.radio.exclude.slsi",
+	owner: "samsung",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
+prebuilt_etc_xml {
+	name: "vendor.samsung.hardware.radio_manifest_2_33",
+	owner: "samsung",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
+prebuilt_etc_xml {
+	name: "vendor.samsung.hardware.sehradio_manifest_2_33",
+	owner: "samsung",
+	src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml",
+	filename_from_src: true,
+	sub_dir: "vintf/manifest",
+	soc_specific: true,
+}
+
 cc_prebuilt_binary {
 	name: "cass",
 	owner: "samsung",
diff --git a/exynos9820-common-vendor.mk b/exynos9820-common-vendor.mk
index cf868f8..8a14424 100644
--- a/exynos9820-common-vendor.mk
+++ b/exynos9820-common-vendor.mk
@@ -16,7 +16,7 @@
     vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/init.vendor.rilcommon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.rilcommon.rc \
     vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/teegris_v3.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/teegris_v3.rc \
     vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/vaultkeeper_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vaultkeeper_common.rc \
-    vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/vendor.sem.rilchip.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sem.rilchip.rc \
+    vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/vendor.samsung.rilchip.slsi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.rilchip.slsi.rc \
     vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/wifi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi.rc \
     vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/wifi_brcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi_brcm.rc \
     vendor/samsung/exynos9820-common/proprietary/vendor/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@@ -114,10 +114,16 @@
     libvkmanager_vendor \
     libvkservice \
     vendor.samsung.hardware.gnss@2.0 \
-    vendor.samsung.hardware.radio.bridge@2.0 \
-    vendor.samsung.hardware.radio.bridge@2.1 \
-    vendor.samsung.hardware.radio.channel@2.0 \
+    vendor.samsung.hardware.radio-V1-ndk \
+    vendor.samsung.hardware.radio.bridge-V1-ndk \
+    vendor.samsung.hardware.radio.channel-V1-ndk \
+    vendor.samsung.hardware.radio.data-V1-ndk \
+    vendor.samsung.hardware.radio.messaging-V1-ndk \
+    vendor.samsung.hardware.radio.sim-V1-ndk \
     manifest_android.hardware.drm@1.4-service.widevine \
+    vendor.samsung.hardware.radio.exclude.slsi \
+    vendor.samsung.hardware.radio_manifest_2_33 \
+    vendor.samsung.hardware.sehradio_manifest_2_33 \
     cass \
     cbd \
     android.hardware.drm@1.4-service.widevine \
diff --git a/proprietary/vendor/bin/hw/rild b/proprietary/vendor/bin/hw/rild
index d1b2dbb..252153d 100644
--- a/proprietary/vendor/bin/hw/rild
+++ b/proprietary/vendor/bin/hw/rild
Binary files differ
diff --git a/proprietary/vendor/etc/init/vendor.samsung.rilchip.slsi.rc b/proprietary/vendor/etc/init/vendor.samsung.rilchip.slsi.rc
new file mode 100644
index 0000000..bf44bc2
--- /dev/null
+++ b/proprietary/vendor/etc/init/vendor.samsung.rilchip.slsi.rc
@@ -0,0 +1,25 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# IMPORTANT: Do not create world writable files or directories.
+# This is a common source of Android security bugs.
+#
+
+service ril-daemon /vendor/bin/hw/rild
+    class main
+    user radio
+    group radio cache inet misc audio sdcard_r sdcard_rw log vpn system readproc wakelock
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME
+    socket sap_uim_socket1 stream 660 bluetooth bluetooth
+    onrestart restart cpboot-daemon
+    onrestart restart cpboot-daemon5g
+    onrestart restart DIAG-daemon
+    override
+
+# LSI CDMA project daemon support dun function
+service VC-daemon /vendor/bin/vcd
+    class main
+    user root
+    group system
+    disabled
+    seclabel u:r:vcd:s0
+    override
\ No newline at end of file
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml
new file mode 100644
index 0000000..1d78efe
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio.exclude.slsi.xml
@@ -0,0 +1,6 @@
+<manifest version="1.0" type="device">
+    <hal override="true" format="hidl">
+        <name>vendor.samsung_slsi.hardware.radio</name>
+        <transport>hwbinder</transport>
+    </hal>
+</manifest>
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
new file mode 100644
index 0000000..a2a9509
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml
@@ -0,0 +1,82 @@
+<manifest version="1.0" type="device">
+    <hal override="true" format="hidl">
+        <name>android.hardware.radio.deprecated</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>android.hardware.radio</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>android.hardware.radio</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.2::ISap/slot1</fqname>
+        <fqname>@1.2::ISap/slot2</fqname>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>android.hardware.radio.config</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.modem</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioModem</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.network</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioNetwork</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.voice</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioVoice</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.config</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioConfig</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.sim</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioSim</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.data</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioData</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.messaging</name>
+        <version>1</version>
+        <interface>
+            <name>IRadioMessaging</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml
new file mode 100644
index 0000000..956fe6b
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml
@@ -0,0 +1,58 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>vendor.samsung.hardware.radio.network</name>
+        <version>1</version>
+        <interface>
+            <name>ISehRadioNetwork</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.samsung.hardware.radio.channel</name>
+        <version>1</version>
+        <interface>
+            <name>ISehRadioChannel</name>
+            <instance>imsd</instance>
+            <instance>imsd2</instance>
+            <instance>epdgd</instance>
+            <instance>epdgd2</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.samsung.hardware.radio.bridge</name>
+        <version>1</version>
+        <interface>
+            <name>ISehRadioBridge</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.samsung.hardware.radio.data</name>
+        <version>1</version>
+        <interface>
+            <name>ISehRadioData</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.samsung.hardware.radio.sim</name>
+        <version>1</version>
+        <interface>
+            <name>ISehRadioSim</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.samsung.hardware.radio.messaging</name>
+        <version>1</version>
+        <interface>
+            <name>ISehRadioMessaging</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/proprietary/vendor/lib/libsecril-client.so b/proprietary/vendor/lib/libsecril-client.so
index 6474843..6d9a14e 100644
--- a/proprietary/vendor/lib/libsecril-client.so
+++ b/proprietary/vendor/lib/libsecril-client.so
Binary files differ
diff --git a/proprietary/vendor/lib/libsemnativecarrierfeature.so b/proprietary/vendor/lib/libsemnativecarrierfeature.so
index 8eba07d..baeb655 100644
--- a/proprietary/vendor/lib/libsemnativecarrierfeature.so
+++ b/proprietary/vendor/lib/libsemnativecarrierfeature.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libSemDataProps.so b/proprietary/vendor/lib64/libSemDataProps.so
index c8dd104..2055cf6 100644
--- a/proprietary/vendor/lib64/libSemDataProps.so
+++ b/proprietary/vendor/lib64/libSemDataProps.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libSemTelephonyProps.so b/proprietary/vendor/lib64/libSemTelephonyProps.so
index da19b76..8a92efd 100644
--- a/proprietary/vendor/lib64/libSemTelephonyProps.so
+++ b/proprietary/vendor/lib64/libSemTelephonyProps.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libril_sem.so b/proprietary/vendor/lib64/libril_sem.so
index 7c572a6..897bc10 100644
--- a/proprietary/vendor/lib64/libril_sem.so
+++ b/proprietary/vendor/lib64/libril_sem.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libsec-ril.so b/proprietary/vendor/lib64/libsec-ril.so
index 35a86af..69743af 100644
--- a/proprietary/vendor/lib64/libsec-ril.so
+++ b/proprietary/vendor/lib64/libsec-ril.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libsecril-client.so b/proprietary/vendor/lib64/libsecril-client.so
index 467b0b0..6b3101b 100644
--- a/proprietary/vendor/lib64/libsecril-client.so
+++ b/proprietary/vendor/lib64/libsecril-client.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libsemnativecarrierfeature.so b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
index ebdeb64..29483f3 100644
--- a/proprietary/vendor/lib64/libsemnativecarrierfeature.so
+++ b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so
new file mode 100644
index 0000000..d583674
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so
new file mode 100644
index 0000000..c9d9313
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
deleted file mode 100644
index 79e8497..0000000
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
deleted file mode 100644
index c56f2ba..0000000
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so
new file mode 100644
index 0000000..f3d5cf3
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
deleted file mode 100644
index 627fb4f..0000000
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so
new file mode 100644
index 0000000..baca0c2
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so
new file mode 100644
index 0000000..d8cb7d9
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
new file mode 100644
index 0000000..acdcb67
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.0.so
deleted file mode 100644
index bffc8c1..0000000
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.0.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.1.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.1.so
deleted file mode 100644
index 35e9722..0000000
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.1.so
+++ /dev/null
Binary files differ