diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index dd9f1181..4f922230 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -13,7 +13,7 @@ AocPowerPinCtrlCheckEnable = true
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
+BqrEventMaskValueUpdate = 295006
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf
index 19388fc7..b96b7b7f 100644
--- a/bluetooth/bt_vendor_overlay_caiman.conf
+++ b/bluetooth/bt_vendor_overlay_caiman.conf
@@ -10,7 +10,7 @@ UartPort = /dev/ttySAC18
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
+BqrEventMaskValueUpdate = 295006
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf
index 19388fc7..b96b7b7f 100644
--- a/bluetooth/bt_vendor_overlay_komodo.conf
+++ b/bluetooth/bt_vendor_overlay_komodo.conf
@@ -10,7 +10,7 @@ UartPort = /dev/ttySAC18
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
+BqrEventMaskValueUpdate = 295006
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf
index 19388fc7..b96b7b7f 100644
--- a/bluetooth/bt_vendor_overlay_tokay.conf
+++ b/bluetooth/bt_vendor_overlay_tokay.conf
@@ -10,7 +10,7 @@ UartPort = /dev/ttySAC18
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
+BqrEventMaskValueUpdate = 295006
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/device-caiman.mk b/device-caiman.mk
index 3c1f1b93..fc9bb23d 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -126,10 +126,16 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=262238
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=29 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=94
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # default BDADDR for EVB only
diff --git a/device-komodo.mk b/device-komodo.mk
index 4f2a0ceb..f3f04439 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -137,10 +137,16 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=262238
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=29 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=94
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # default BDADDR for EVB only
diff --git a/device-tokay.mk b/device-tokay.mk
index 978ff747..7ab7271f 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -128,10 +128,16 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=262238
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=29 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=true
 else
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=94
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false
 endif
 
 # default BDADDR for EVB only