diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index b796740..5acb97b 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -10,7 +10,8 @@ AocPowerPinCtrlCheckEnable = true
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
+# TODO: remove this bqr event mask setting after Alpha exit
+BqrEventMaskValueUpdate = 295006
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf
index edf5f27..2473a1b 100644
--- a/bluetooth/bt_vendor_overlay_ripcurrent.conf
+++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf
@@ -7,7 +7,8 @@ UartPort = /dev/ttySAC18
 SarBackOffHighResolution = true
 
 # Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
+# TODO: remove this bqr event mask setting after Alpha exit
+BqrEventMaskValueUpdate = 295006
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
diff --git a/device-husky.mk b/device-husky.mk
index 839ef05..59a3138 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -137,10 +137,14 @@ 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
 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
 endif
 
 # Spatial Audio
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 3286cd0..96aca08 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -125,10 +125,14 @@ 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
 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
 endif
 
 # default BDADDR for EVB only
diff --git a/device-shiba.mk b/device-shiba.mk
index 76c77a3..d904d28 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -124,10 +124,14 @@ 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
 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
 endif
 
 # Spatial Audio