diff --git a/properties/common_prop.mk b/properties/common_prop.mk
index 87d8fa8c..0d0f162d 100644
--- a/properties/common_prop.mk
+++ b/properties/common_prop.mk
@@ -236,10 +236,17 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Radio
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.data.df.dev_name=rmnet_usb0 \
+    persist.dbg.volte_avail_ovr=1 \
+    persist.dbg.vt_avail_ovr=1 \
+    persist.dbg.wfc_avail_ovr=1 \
+    persist.dbg.ims_volte_enable=1 \
     persist.debug.coresight.config=stm-events \
     persist.radio.multisim.config=dsds \
+    persist.vendor.data.iwlan.enable=true \
+    persist.vendor.data.mode=concurrent \
     persist.vendor.dpmhalservice.enable=1 \
+    persist.vendor.ims.disableADBLogs=1 \
+    persist.vendor.ims.disableIMSLogs=1 \
     persist.vendor.qti.telephony.vt_cam_interface=1 \
     persist.vendor.radio.add_power_save=1 \
     persist.vendor.radio.apm_sim_not_pwdn=1 \
@@ -248,9 +255,18 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.radio.data_con_rprt=1 \
     persist.vendor.radio.procedure_bytes=SKIP \
     persist.vendor.radio.rat_on=combine \
+    persist.vendor.radio.redir_party_num=1 \
     persist.vendor.radio.sib16_support=1 \
+    persist.vendor.radio.data_ltd_sys_ind=1 \
+    persist.vendor.radio.force_ltd_sys_ind=1 \
+    persist.vendor.radio.manual_nw_rej_ct=1 \
+    persist.vendor.radio.mt_sms_ack=30 \
+    persist.vendor.radio.procedure_bytes=SKIP \
+    persist.radio.calls.on.ims=1 \
     ro.telephony.iwlan_operation_mode=legacy \
     ro.vendor.use_data_netmgrd=true \
+    ro.vendor.qti.va_aosp.support=1 \
+    ro.telephony.default_cdma_sub=0 \
     ro.telephony.default_network=22,20 \
     vendor.rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
 
@@ -260,14 +276,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     debug.enable.sglscale=1 \
     debug.sf.disable_hwc=0 \
     debug.sf.gpu_comp_tiling=1 \
-    debug.sf.recomputecrop=0 \
-    persist.dbg.ims_volte_enable=1 \
-    persist.dbg.wfc_avail_ovr=1 \
-    persist.vendor.ims.disableADBLogs=1 \
-    persist.vendor.ims.disableIMSLogs=1 \
-    persist.vendor.radio.data_ltd_sys_ind=1 \
-    persist.vendor.radio.force_ltd_sys_ind=1 \
-    persist.radio.calls.on.ims=1
+    debug.sf.recomputecrop=0
 
 # Sensor
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/properties/product.prop b/properties/product.prop
index 9a5f4c37..8048f855 100644
--- a/properties/product.prop
+++ b/properties/product.prop
@@ -6,6 +6,16 @@ ro.config.vc_call_vol_steps=7
 ro.sf.blurs_are_expensive=1
 ro.surface_flinger.supports_background_blur=1
 
+# CNE
+persist.vendor.cne.feature=1
+
+# Data
+persist.data.df.dev_name=rmnet_usb0
+persist.vendor.data.profile_update=true
+
+# DPM
+persist.vendor.dpm.feature=1
+
 # Fling
 ro.min.fling_velocity=160
 ro.max.fling_velocity=20000
@@ -29,8 +39,8 @@ ro.com.google.ime.kb_pad_port_b=1
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
 
-# IORAP
-ro.iorapd.enable=true
+# IMS
+persist.vendor.ims.disableUserAgent=0
 
 # LMKD
 ro.lmk.log_stats=true
@@ -48,6 +58,19 @@ ro.lmk.use_minfree_levels=true
 # OEM Unlock reporting
 ro.oem_unlock_supported=1
 
+# Radio
+DEVICE_PROVISIONED=1
+persist.backup.ntpServer=0.pool.ntp.org
+persist.radio.aosp_usr_pref_sel=true
+persist.radio.add_power_save=1
+persist.radio.VT_CAM_INTERFACE=2 
+persist.radio.data_con_rprt=1
+persist.vendor.radio.enable_temp_dds=true
+persist.vendor.radio.force_on_dc=true
+ril.subscription.types=RUIM
+ro.telephony.default_network=33,33
+telephony.lteOnCdmaDevice=1
+
 # SELinux
 ro.build.selinux=1
 
diff --git a/properties/system.prop b/properties/system.prop
index db701632..ba175f1d 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -14,12 +14,6 @@ persist.vendor.camera.privapp.list=org.codeaurora.snapcam
 ro.charger.enable_suspend=true
 ro.charger.disable_init_blank=true
 
-# CNE
-persist.vendor.cne.feature=1
-
-# DPM
-persist.vendor.dpm.feature=1
-
 # Disable GC freed lines
 dalvik.vm.debug.alloc=0
 
@@ -35,32 +29,12 @@ vendor.display.disable_rotator_downscale=1
 # Fwk detect
 ro.vendor.qti.va_aosp.support=1
 
-# IMS
-persist.dbg.volte_avail_ovr=1
-persist.dbg.vt_avail_ovr=1
-persist.vendor.ims.disableUserAgent=0
-
-# Netmgr
-persist.vendor.data.iwlan.enable=true
-persist.vendor.data.mode=concurrent
-
 # Proximity
 gsm.proximity.enable=true
 
 # Time daemon
 persist.timed.enable=true
 
-# Radio
-DEVICE_PROVISIONED=1
-persist.backup.ntpServer=0.pool.ntp.org
-persist.radio.aosp_usr_pref_sel=true
-persist.radio.add_power_save=1
-persist.radio.VT_CAM_INTERFACE=2 
-persist.radio.data_con_rprt=1
-ril.subscription.types=NV,RUIM
-ro.telephony.default_network=33,33
-telephony.lteOnCdmaDevice=1
-
 # Rendering
 persist.hwc.ptor.enable=true