diff --git a/debian.aws-21.04/config/annotations b/debian.aws-21.04/config/annotations
index d50846265497..9cebc0488747 100644
--- a/debian.aws-21.04/config/annotations
+++ b/debian.aws-21.04/config/annotations
@@ -10788,7 +10788,8 @@ CONFIG_BAYCOM_EPP                               policy<{'armhf': 'm'}>
 CONFIG_YAM                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 
 # Menu: Networking support >> Bluetooth subsystem support
-CONFIG_BT                                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': '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', 'ppc64el': 'y'}>
 CONFIG_BT_6LOWPAN                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_LEDS                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
@@ -10805,7 +10806,7 @@ CONFIG_BT_BNEP_MC_FILTER                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_BT_BNEP_PROTO_FILTER                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_BT_CMTP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_BT_HIDP                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_BT_HS                                    policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
+CONFIG_BT_HS                                    policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', '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-21.04/config/config.common.ubuntu b/debian.aws-21.04/config/config.common.ubuntu
index f26d89553d97..f431da9d9261 100644
--- a/debian.aws-21.04/config/config.common.ubuntu
+++ b/debian.aws-21.04/config/config.common.ubuntu
@@ -1101,7 +1101,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_BT=m
+# CONFIG_BT is not set
 CONFIG_BTREE=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -1111,59 +1111,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_HCIBLUECARD=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_MTK=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIRSI=m
-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_RTL=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_MSFTEXT=y
-CONFIG_BT_MTKSDIO=m
-CONFIG_BT_MTKUART=m
-CONFIG_BT_QCA=m
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_RTL=m
-# CONFIG_BT_SELFTEST is not set
 CONFIG_BUG=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -1239,7 +1186,6 @@ CONFIG_CAN_UCAN=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_VXCAN=m
 CONFIG_CAN_XILINXCAN=m
-CONFIG_CAPI_TRACE=y
 CONFIG_CARDBUS=y
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
@@ -4685,8 +4631,6 @@ CONFIG_ISCSI_TARGET=m
 CONFIG_ISCSI_TARGET_CXGB4=m
 CONFIG_ISCSI_TCP=m
 CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISI=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
@@ -7781,7 +7725,6 @@ CONFIG_RPR0521=m
 CONFIG_RPS=y
 CONFIG_RSEQ=y
 CONFIG_RSI_91X=m
-CONFIG_RSI_COEX=y
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
