diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index 951adb1..e875397 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -7,8 +7,14 @@
 # Manifests
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE += \
-    device/google/zumapro/android.hardware.security.rkp-service.citadel.xml \
+    device/google/zumapro/android.hardware.security.rkp-service.citadel.xml
+ifeq ($(PRODUCT_SHIPPING_API_LEVEL),35)
+DEVICE_MANIFEST_FILE += \
+    device/google/zumapro/manifest_radio_ds_202404.xml
+else
+DEVICE_MANIFEST_FILE += \
     device/google/zumapro/manifest_radio_ds.xml
+endif
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
     device/google/zumapro/aam_compatibility_matrix.xml \
     device/google/zumapro/location/device_framework_matrix_product.xml
diff --git a/manifest_radio_ds_202404.xml b/manifest_radio_ds_202404.xml
new file mode 100644
index 0000000..b7d7e90
--- /dev/null
+++ b/manifest_radio_ds_202404.xml
@@ -0,0 +1,57 @@
+<manifest version="1.0" type="device">
+    <hal format="aidl">
+        <name>android.hardware.radio.config</name>
+        <version>3</version>
+        <fqname>IRadioConfig/default</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.data</name>
+        <version>3</version>
+        <fqname>IRadioData/slot1</fqname>
+        <fqname>IRadioData/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.messaging</name>
+        <version>3</version>
+        <fqname>IRadioMessaging/slot1</fqname>
+        <fqname>IRadioMessaging/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.modem</name>
+        <version>3</version>
+        <fqname>IRadioModem/slot1</fqname>
+        <fqname>IRadioModem/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.network</name>
+        <version>3</version>
+        <fqname>IRadioNetwork/slot1</fqname>
+        <fqname>IRadioNetwork/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.sap</name>
+        <fqname>ISap/slot1</fqname>
+        <fqname>ISap/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.sim</name>
+        <version>3</version>
+        <fqname>IRadioSim/slot1</fqname>
+        <fqname>IRadioSim/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.radio.voice</name>
+        <version>3</version>
+        <fqname>IRadioVoice/slot1</fqname>
+        <fqname>IRadioVoice/slot2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.secure_element</name>
+        <fqname>ISecureElement/SIM1</fqname>
+        <fqname>ISecureElement/SIM2</fqname>
+    </hal>
+    <hal format="aidl">
+        <name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
+        <fqname>IOemSlsiRadioExternal/default</fqname>
+    </hal>
+</manifest>