diff --git a/device-oriole.mk b/device-oriole.mk
index 841c551..827e244 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -68,7 +68,8 @@ PRODUCT_COPY_FILES += \
 
 # Bluetooth
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.a2dp_aac.vbr_supported=true
+    persist.bluetooth.a2dp_aac.vbr_supported=true \
+    persist.bluetooth.firmware.selection=BCM.hcd
 
 # Bluetooth Tx power caps for oriole
 PRODUCT_COPY_FILES += \
diff --git a/device-raven.mk b/device-raven.mk
index 81b31e5..cf27fc2 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -76,7 +76,8 @@ PRODUCT_COPY_FILES += \
 
 # Bluetooth
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.a2dp_aac.vbr_supported=true
+    persist.bluetooth.a2dp_aac.vbr_supported=true \
+    persist.bluetooth.firmware.selection=BCM.hcd
 
 # Bluetooth Tx power caps for raven
 PRODUCT_COPY_FILES += \