diff --git a/BUILD.bazel b/BUILD.bazel
index 201c3d7302ce..86109fed8a8d 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -31,6 +31,10 @@ _aarch64_additional_kmi_symbol_lists = [
 _common_gki_modules_list = [
     # keep sorted
     "drivers/block/zram/zram.ko",
+    "drivers/bluetooth/btbcm.ko",
+    "drivers/bluetooth/btqca.ko",
+    "drivers/bluetooth/btsdio.ko",
+    "drivers/bluetooth/hci_uart.ko",
     "drivers/net/can/dev/can-dev.ko",
     "drivers/net/can/slcan.ko",
     "drivers/net/can/vcan.ko",
diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index 91df721570a0..c92800083795 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -6,6 +6,10 @@ drivers/net/can/slcan.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/usbserial.ko
 drivers/usb/serial/ftdi_sio.ko
+drivers/bluetooth/hci_uart.ko
+drivers/bluetooth/btsdio.ko
+drivers/bluetooth/btbcm.ko
+drivers/bluetooth/btqca.ko
 net/can/can-raw.ko
 net/can/can-bcm.ko
 net/can/can-gw.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index bd2724940564..21ac59d98672 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -1,4 +1,8 @@
 drivers/block/zram/zram.ko
+drivers/bluetooth/btbcm.ko
+drivers/bluetooth/btqca.ko
+drivers/bluetooth/btsdio.ko
+drivers/bluetooth/hci_uart.ko
 drivers/net/can/dev/can-dev.ko
 drivers/net/can/slcan.ko
 drivers/net/can/vcan.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 9dcc6b71651e..7a384afd9360 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -282,8 +282,8 @@ CONFIG_BT=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTSDIO=y
-CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index a679822562cc..c7c6646c938b 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -263,8 +263,8 @@ CONFIG_BT=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTSDIO=y
-CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y