diff --git a/aosp_beryllium.mk b/aosp_beryllium.mk
index 4980f6e..b56bc69 100644
--- a/aosp_beryllium.mk
+++ b/aosp_beryllium.mk
@@ -1,15 +1,20 @@
 DB845C_KERNEL_DIR := device/linaro/dragonboard-kernel/android-5.4
-LOCAL_KERNEL_DIR := device/xiaomi/beryllium/prebuilt-kernel/android-5.4
-
 DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko)
+
 # Local modules are built from following tree:
 # https://github.com/pundiramit/linux/tree/android-5.4-modules
+LOCAL_KERNEL_DIR := device/xiaomi/beryllium/prebuilt-kernel/android-5.4
 LOCAL_MODS := $(wildcard $(LOCAL_KERNEL_DIR)/*.ko)
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(DB845C_MODS)
+
 # Skip copying modules broken on android-5.4
 # Use local module copy instead
-SKIP_MODS := %/msm.ko
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(SKIP_MODS),$(DB845C_MODS))
+DB845C_SKIP_MODS := %/msm.ko
+
+# BT modules go to vendor partition
+DB845C_ONLY_VENDOR := %/btqca.ko %/hci_uart.ko
+BOARD_VENDOR_KERNEL_MODULES := $(filter $(DB845C_ONLY_VENDOR),$(DB845C_MODS))
+
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(DB845C_SKIP_MODS) $(DB845C_ONLY_VENDOR),$(DB845C_MODS))
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(LOCAL_MODS)
 
 # Inherit the full_base and device configurations