diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ba3720a..c643c02 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -72,10 +72,10 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 USE_CUSTOM_AUDIO_POLICY := 1
 
 # Bluetooth
+BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_CUSTOM_BT_CONFIG := $(COMMON_PATH)/bluetooth/libbt_vndcfg.txt
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth
-BOARD_HAS_QCA_BT_ROME := true
-BOARD_HAVE_BLUETOOTH_QCOM := true
-QCOM_BT_USE_BTNV := true
 
 # Camera
 BOARD_QTI_CAMERA_32BIT_ONLY := true
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 268588d..d7e7309 100755
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -23,13 +23,12 @@
 #define _BDROID_BUILDCFG_H
 
 #define BTM_DEF_LOCAL_NAME   "Samsung Galaxy S7"
-#define BLUETOOTH_QTI_SW TRUE
-#define MAX_ACL_CONNECTIONS   16
-#define MAX_L2CAP_CHANNELS    16
-#define BLE_VND_INCLUDED   TRUE
-#define BT_CLEAN_TURN_ON_DISABLED 1
 
-/* Increasing SEPs to 12 from 6 to support SHO/MCast i.e. two streams per codec */
-#define AVDT_NUM_SEPS 12
+#define BTA_DISABLE_DELAY 1000 /* in milliseconds */
+
+#define BTM_WBS_INCLUDED TRUE       /* Enable WBS */
+#define BTIF_HF_WBS_PREFERRED TRUE  /* Use WBS    */
+
+#define BLE_VND_INCLUDED TRUE
 
 #endif
diff --git a/bluetooth/libbt_vndcfg.txt b/bluetooth/libbt_vndcfg.txt
new file mode 100644
index 0000000..4c7be97
--- /dev/null
+++ b/bluetooth/libbt_vndcfg.txt
@@ -0,0 +1,13 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0"
+BTHW_DBG = TRUE
+BT_WAKE_VIA_PROC = TRUE
+BT_WAKE_VIA_PROC_NOTIFY_DEASSERT=TRUE
+FW_PATCHFILE_LOCATION = "/vendor/firmware"
+FW_PATCH_SETTLEMENT_DELAY_MS = 100
+LPM_COMBINE_SLEEP_MODE_AND_LPM = 0
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+PROC_BTWRITE_TIMER_TIMEOUT_MS = 0
+SCO_WBS_SAMPLE_RATE = 0
+UART_FORCE_TWO_STOPBITS = TRUE
+UART_TARGET_BAUD_RATE = 3000000
+USE_AXI_BRIDGE_LOCK = TRUE
diff --git a/manifest.xml b/manifest.xml
index 2e51aab..ea6d1f5 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -209,15 +209,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>com.qualcomm.qti.bluetooth_audio</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IBluetoothAudio</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" override="true">
         <name>com.qualcomm.qti.dpm.api</name>
         <transport>hwbinder</transport>
@@ -381,15 +372,6 @@
             <instance>wifidisplaysessionvideotrack</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.bluetooth</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISecBluetooth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.samsung.hardware.exthealth</name>
         <transport>hwbinder</transport>
diff --git a/msm8996.mk b/msm8996.mk
index 35dd2e5..fc4e9ae 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -123,8 +123,9 @@ PRODUCT_COPY_FILES += \
 
 # Bluetooth
 PRODUCT_PACKAGES += \
-    com.qualcomm.qti.bluetooth_audio@1.0.vendor \
-    vendor.qti.hardware.btconfigstore@1.0.vendor
+    android.hardware.bluetooth@1.0-impl:64 \
+    android.hardware.bluetooth@1.0-service \
+    libbt-vendor
 
 # Camera
 PRODUCT_PACKAGES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b67a6fd..0976712 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -68,24 +68,15 @@ vendor/lib64/soundfx/libqcbassboost.so
 vendor/lib64/soundfx/libqcvirt.so
 vendor/lib64/soundfx/libswdap.so
 
-# Bluetooth
-vendor/bin/btnvtool
-vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
-vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
-vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
-vendor/lib64/libbtnv.so
-vendor/lib64/libbt-hidlclient.so
-vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
-lib/vendor.samsung.hardware.bluetooth@1.0.so
-lib64/vendor.samsung.hardware.bluetooth@1.0.so
-
 # Bluetooth (aptX) - from crosshatch - QP1A.190711.020
 product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
 product/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
 
 # Bluetooth (firmware)
-etc/firmware/btfw32.tlv:vendor/firmware/btfw32.tlv
-etc/firmware/btnv32.bin:vendor/firmware/btnv32.bin
+vendor/firmware/bcm4359C0_V0138.0278_murata.hcd
+vendor/firmware/bcm4359C0_V0138.0279_semco.hcd
+vendor/firmware/bcm4359C0_V0166.0407_murata.hcd
+vendor/firmware/bcm4359C0_V0166.0408_semco.hcd
 
 # Camera
 lib/libuniapi.so