diff --git a/product.prop b/product.prop
index aefdfd6..41794bb 100644
--- a/product.prop
+++ b/product.prop
@@ -1,3 +1,15 @@
+# Audio 
+audio.offload.disable=true
+audio.sys.noisy.broadcast.delay=600
+audio.sys.offload.pstimeout.secs=3
+persist.audio.fluence.voicecall=true
+persist.audio.fluence.voicerec=false
+persist.audio.fluence.speaker=true
+persist.audio.fluence.voicecomm=true
+persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
+ro.qc.sdk.audio.ssr=false
+ro.qc.sdk.audio.fluencetype=none
+
 # Blurs
 ro.surface_flinger.supports_background_blur=0
 
diff --git a/vendor.prop b/vendor.prop
index 518acf3..42a410c 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,13 +1,9 @@
 # Audio
 af.fast_track_multiplier=1
 audio.deep_buffer.media=true
-audio.offload.disable=true
 audio.offload.min.duration.secs=30
 audio.offload.video=true
-audio.sys.noisy.broadcast.delay=600
-audio.sys.offload.pstimeout.secs=3
 vendor.audio_hal.period_size=192
-persist.audio.fluence.voicecomm=true
 persist.vendor.audio.fluence.speaker=false
 persist.vendor.audio.endcall.delay=600
 persist.vendor.audio.ambisonic.capture=false
@@ -16,18 +12,12 @@ persist.vendor.audio.fluence.voicecall=true
 persist.vendor.audio.fluence.voicerec=false
 persist.vendor.audio.fluence.audiorec=false
 persist.vendor.audio.fluence.tmic.enabled=false
-persist.audio.fluence.voicecall=true
-persist.audio.fluence.voicerec=false
-persist.audio.fluence.speaker=true
 persist.vendor.audio.hifi.int_codec=true
 persist.vendor.audio.spv3.enable=true
 persist.vendor.audio.avs.afe_api_version=2
 persist.vendor.audio.ras.enabled=false
 persist.vendor.bt.aac_frm_ctl.enabled=true
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac
 ro.af.client_heap_size_kbyte=7168
-ro.qc.sdk.audio.ssr=false
-ro.qc.sdk.audio.fluencetype=none
 ro.vendor.audio.sdk.fluencetype=fluence
 ro.vendor.audio.sdk.ssr=false
 vendor.audio.tunnel.encode=false