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 3caae07..a034a01 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -257,6 +257,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
 
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true
+
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \
diff --git a/device-raven.mk b/device-raven.mk
index cccf860..b965539 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -268,6 +268,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     debug.sf.enable_adpf_cpu_hint=true
 
+# Bluetooth OPUS codec
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.opus.enabled=true
+
 # Location
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
         PRODUCT_COPY_FILES += \