diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index d5212db..4208da8 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -1,3 +1,5 @@
 # This is BTBCM HAL overlay configuration file.
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
+
+BtOpusEnabled = true
diff --git a/device-oriole.mk b/device-oriole.mk
index 176175b..37f49a0 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -243,9 +243,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.le_audio_test=false
 endif
 
-# declare use of spatial audio
+# declare use of spatial audio: disabled
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.spatializer_enabled=true
+    ro.audio.spatializer_enabled=false
 
 PRODUCT_PACKAGES += \
 	libspatialaudio
@@ -267,3 +267,7 @@ PRODUCT_RESTRICT_VENDOR_FILES := false
 # Enable adpf cpu hint session for SurfaceFlinger
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
+
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true
diff --git a/device-raven.mk b/device-raven.mk
index 19e940b..44a81eb 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -256,9 +256,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.le_audio_test=false
 endif
 
-# declare use of spatial audio
+# declare use of spatial audio: disabled
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.audio.spatializer_enabled=true
+    ro.audio.spatializer_enabled=false
 
 PRODUCT_PACKAGES += \
 	libspatialaudio
@@ -280,3 +280,7 @@ PRODUCT_RESTRICT_VENDOR_FILES := false
 # Enable adpf cpu hint session for SurfaceFlinger
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
+
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true