diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 471399d..1d33874 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -64,7 +64,8 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
 
 DEVICE_MANIFEST_FILE := \
     $(COMMON_PATH)/vintf/manifest_kalama.xml \
-    $(COMMON_PATH)/vintf/manifest_samsung.xml
+    $(COMMON_PATH)/vintf/manifest_samsung.xml \
+    $(COMMON_PATH)/vintf/radio_manifest.xml
 
 DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
 
diff --git a/vintf/manifest_samsung.xml b/vintf/manifest_samsung.xml
index 5522824..3fd9437 100644
--- a/vintf/manifest_samsung.xml
+++ b/vintf/manifest_samsung.xml
@@ -23,78 +23,6 @@
         </interface>
         <fqname>@4.0::IKeymasterDevice/strongbox</fqname>
     </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.config</name>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>IRadioConfig/default</fqname>
-    </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.data</name>
-        <interface>
-            <name>IRadioData</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>IRadioData/slot1</fqname>
-        <fqname>IRadioData/slot2</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.radio.deprecated</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.messaging</name>
-        <interface>
-            <name>IRadioMessaging</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>IRadioMessaging/slot1</fqname>
-        <fqname>IRadioMessaging/slot2</fqname>
-    </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.modem</name>
-        <interface>
-            <name>IRadioModem</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>IRadioModem/slot1</fqname>
-        <fqname>IRadioModem/slot2</fqname>
-    </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.network</name>
-        <interface>
-            <name>IRadioNetwork</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>IRadioNetwork/slot1</fqname>
-        <fqname>IRadioNetwork/slot2</fqname>
-    </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.sim</name>
-        <interface>
-            <name>IRadioSim</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>IRadioSim/slot1</fqname>
-        <fqname>IRadioSim/slot2</fqname>
-    </hal>
-    <hal format="aidl" override="true">
-        <name>android.hardware.radio.voice</name>
-        <interface>
-            <name>IRadioVoice</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>IRadioVoice/slot1</fqname>
-        <fqname>IRadioVoice/slot2</fqname>
-    </hal>
     <hal format="aidl" override="true">
         <name>android.hardware.security.keymint</name>
         <version>2</version>
@@ -109,22 +37,6 @@
         <fqname>IKeyMintDevice/default</fqname>
         <fqname>IRemotelyProvisionedComponent/default</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.am</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.ims</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.qcrilhook</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.qtiradio</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.bluetooth</name>
         <transport>hwbinder</transport>
@@ -163,68 +75,4 @@
         </interface>
         <fqname>ISehKeyMintFactory/default</fqname>
     </hal>
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.radio.bridge</name>
-        <interface>
-            <name>ISehRadioBridge</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>ISehRadioBridge/slot1</fqname>
-        <fqname>ISehRadioBridge/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.radio.channel</name>
-        <interface>
-            <name>ISehRadioChannel</name>
-            <instance>epdgd</instance>
-            <instance>epdgd2</instance>
-            <instance>imsd</instance>
-            <instance>imsd2</instance>
-        </interface>
-        <fqname>ISehRadioChannel/epdgd</fqname>
-        <fqname>ISehRadioChannel/epdgd2</fqname>
-        <fqname>ISehRadioChannel/imsd</fqname>
-        <fqname>ISehRadioChannel/imsd2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.radio.data</name>
-        <interface>
-            <name>ISehRadioData</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>ISehRadioData/slot1</fqname>
-        <fqname>ISehRadioData/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.radio.messaging</name>
-        <interface>
-            <name>ISehRadioMessaging</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>ISehRadioMessaging/slot1</fqname>
-        <fqname>ISehRadioMessaging/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.radio.network</name>
-        <interface>
-            <name>ISehRadioNetwork</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>ISehRadioNetwork/slot1</fqname>
-        <fqname>ISehRadioNetwork/slot2</fqname>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.samsung.hardware.radio.sim</name>
-        <interface>
-            <name>ISehRadioSim</name>
-            <instance>slot1</instance>
-            <instance>slot2</instance>
-        </interface>
-        <fqname>ISehRadioSim/slot1</fqname>
-        <fqname>ISehRadioSim/slot2</fqname>
-    </hal>
 </manifest>
diff --git a/vintf/radio_manifest.xml b/vintf/radio_manifest.xml
new file mode 100644
index 0000000..8e9c02f
--- /dev/null
+++ b/vintf/radio_manifest.xml
@@ -0,0 +1,234 @@
+<!--
+    Input:
+        vendor.samsung.hardware.radio.exclude.qcom.xml
+        vendor.samsung.hardware.radio_manifest_2_33.xml
+        vendor.samsung.hardware.sehradio_manifest_2_33.xml
+-->
+<manifest version="1.0" type="device">
+    <!-- << QCOM HAL RELATED RIL -->
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.am</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.ims</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.qcrilhook</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.uim_remote_client</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.uim_remote_server</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.lpa</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.uim</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.qtiradio</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.radio.internal.deviceinfo</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.embmssl</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <!-- >> QCOM HAL RELATED RIL -->
+
+    <!-- << QCOM HAL RELATED IMS -->
+    <hal override="true" format="hidl">
+        <name>vendor.qti.imsrtpservice</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.ims.callinfo</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>com.qualcomm.qti.imscmservice</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>com.qualcomm.qti.uceservice</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <!-- >> QCOM HAL RELATED IMS -->
+
+    <!-- << QCOM HAL RELATED DATA -->
+    <hal override="true" format="hidl">
+        <name>com.qualcomm.qti.dpm.api</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.data.latency</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.data.factory</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.data.connection</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.mwqemadapter</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <hal override="true" format="hidl">
+        <name>vendor.qti.hardware.dpmservice</name>
+        <transport>hwbinder</transport>
+    </hal>
+    <!-- >> QCOM HAL RELATED DATA -->
+
+    <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>
+
+    <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>