diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index c41984342982..ad7d4ad6555b 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -288,6 +288,8 @@ CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 8bf88d07c8ed..cb1d16a5a1b9 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -280,6 +280,8 @@ CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
diff --git a/modules.bzl b/modules.bzl
index 5e613e7e78b2..ebbb90ddaf6e 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -11,8 +11,11 @@ _COMMON_GKI_MODULES_LIST = [
     "drivers/block/virtio_blk.ko",
     "drivers/block/zram/zram.ko",
     "drivers/bluetooth/btbcm.ko",
+    "drivers/bluetooth/btintel.ko",
     "drivers/bluetooth/btqca.ko",
+    "drivers/bluetooth/btrtl.ko",
     "drivers/bluetooth/btsdio.ko",
+    "drivers/bluetooth/btusb.ko",
     "drivers/bluetooth/hci_uart.ko",
     "drivers/char/virtio_console.ko",
     "drivers/gnss/gnss.ko",