diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index ecef27a870e2..e72658954e35 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -11,6 +11,7 @@ drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko
 mm/zsmalloc.ko
 net/8021q/8021q.ko
+net/bluetooth/bluetooth.ko
 net/bluetooth/hidp/hidp.ko
 net/bluetooth/rfcomm/rfcomm.ko
 net/can/can-bcm.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 797f6ae63705..9963c62e851f 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -257,7 +257,7 @@ CONFIG_CAN=y
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
-CONFIG_BT=y
+CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=m
@@ -638,11 +638,13 @@ CONFIG_STATIC_USERMODEHELPER=y
 CONFIG_STATIC_USERMODEHELPER_PATH=""
 CONFIG_SECURITY_SELINUX=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ADIANTUM=y
 CONFIG_CRYPTO_HCTR2=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
 CONFIG_CRYPTO_BLAKE2B=y
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_XCBC=y
 CONFIG_CRYPTO_LZO=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index f6cfed0bf282..66bd0e5df1e3 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -247,7 +247,7 @@ CONFIG_CAN=y
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
-CONFIG_BT=y
+CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=m
@@ -581,11 +581,13 @@ CONFIG_STATIC_USERMODEHELPER=y
 CONFIG_STATIC_USERMODEHELPER_PATH=""
 CONFIG_SECURITY_SELINUX=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_ADIANTUM=y
 CONFIG_CRYPTO_HCTR2=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
 CONFIG_CRYPTO_BLAKE2B=y
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_XCBC=y
 CONFIG_CRYPTO_LZO=y
diff --git a/modules.bzl b/modules.bzl
index 199dbc681efc..d58218c25336 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -13,6 +13,7 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/usb/serial/usbserial.ko",
     "mm/zsmalloc.ko",
     "net/8021q/8021q.ko",
+    "net/bluetooth/bluetooth.ko",
     "net/bluetooth/hidp/hidp.ko",
     "net/bluetooth/rfcomm/rfcomm.ko",
     "net/can/can-bcm.ko",