diff --git a/properties/system.prop b/properties/system.prop
index 09ff382..ea17426 100644
--- a/properties/system.prop
+++ b/properties/system.prop
@@ -1,3 +1,11 @@
+# Audio
+ro.qc.sdk.audio.ssr=false
+ro.qc.sdk.audio.fluencetype=fluence
+persist.audio.fluence.voicecall=true
+persist.audio.fluence.voicerec=true
+persist.audio.fluence.speaker=true
+persist.audio.fluence.voicecomm=true
+
 # Charger
 ro.charger.enable_suspend=true
 
diff --git a/properties/vendor.prop b/properties/vendor.prop
index b07ee09..1464261 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -8,11 +8,6 @@ persist.vendor.audio.fluence.voicecall=true
 persist.vendor.audio.fluence.voicerec=true
 persist.vendor.audio.fluence.speaker=true
 persist.vendor.audio.fluence.tmic.enabled=false
-ro.qc.sdk.audio.ssr=false
-ro.qc.sdk.audio.fluencetype=fluence
-persist.audio.fluence.voicecall=true
-persist.audio.fluence.voicerec=true
-persist.audio.fluence.speaker=true
 persist.vendor.audio.spv3.enable=true
 persist.vendor.audio.avs.afe_api_version=2
 vendor.audio.tunnel.encode=false
@@ -42,7 +37,6 @@ vendor.audio_hal.in_period_size=144
 vendor.audio_hal.period_multiplier=3
 vendor.audio.adm.buffering.ms=2
 vendor.audio.volume.headset.gain.depcal=true
-persist.audio.fluence.voicecomm=true
 debug.stagefright.omx_default_rank=0
 ro.vendor.audio.ring.filter=true
 persist.vendor.audio.ring.filter.mask=0