diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index 9a160243858b..37b751b9396f 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -52,7 +52,6 @@ CONFIG_ATA_PIIX=y
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_BATTERY_SBS is not set
-# CONFIG_BT is not set
 # CONFIG_CHARGER_AXP20X is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_DA9150 is not set
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index c4482a857684..cfe63e912fb0 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -9852,7 +9852,8 @@ CONFIG_BAYCOM_EPP                               policy<{'armhf': 'm', 'i386': 'm
 CONFIG_YAM                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 
 # Menu: Networking support >> Bluetooth subsystem support
-CONFIG_BT                                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+CONFIG_BT                                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
+CONFIG_BT                                       mark<ENFORCED> note<LP:1840488>
 CONFIG_BT_LE                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_6LOWPAN                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_LEDS                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
@@ -9868,7 +9869,7 @@ CONFIG_BT_BNEP_MC_FILTER                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_BT_BNEP_PROTO_FILTER                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_CMTP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_HIDP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
-CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
+CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'i386': '-', 'ppc64el': '-'}>
 CONFIG_BT_HS                                    mark<ENFORCED> note<https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html>
 
 # Menu: Networking support >> Bluetooth subsystem support >> Bluetooth device drivers
diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64
index fc9d92973ee3..8310e56e95f7 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -52,7 +52,6 @@ CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_BATTERY_SBS=m
-CONFIG_BT=m
 CONFIG_CHARGER_AXP20X=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_DA9150=m
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index 4f0b92335623..87a4329e4204 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -886,6 +886,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_BT is not set
 CONFIG_BTREE=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -895,51 +896,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 CONFIG_BTT=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_BCM=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_BREDR=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_DEBUGFS=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_BCM=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIUART_NOKIA=m
-CONFIG_BT_HCIUART_QCA=y
-CONFIG_BT_HCIUART_SERDEV=y
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HIDP=m
-# CONFIG_BT_HS is not set
-CONFIG_BT_INTEL=m
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_QCA=m
-CONFIG_BT_QCOMSMD=m
-# CONFIG_BT_QCOMSMD_HACK is not set
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_RTL=m
-# CONFIG_BT_SELFTEST is not set
-CONFIG_BT_WILINK=m
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 CONFIG_BUILDTIME_EXTABLE_SORT=y
