diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 0c1075eed4fd..03979bbb88d1 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -50,11 +50,9 @@ net/ieee802154/ieee802154.ko
 net/ieee802154/ieee802154_socket.ko
 net/l2tp/l2tp_core.ko
 net/l2tp/l2tp_ppp.ko
-net/mac80211/mac80211.ko
 net/mac802154/mac802154.ko
 net/nfc/nfc.ko
 net/rfkill/rfkill.ko
 net/tipc/diag.ko
 net/tipc/tipc.ko
-net/wireless/cfg80211.ko
 
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index f33579ff5d09..fb4106db4a43 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -276,11 +276,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEFAULT_PS is not set
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=m
 CONFIG_RFKILL=m
 CONFIG_NFC=m
 CONFIG_PCI=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 1af299c2f9c4..ce0bfe83f95e 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -273,11 +273,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEFAULT_PS is not set
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=m
 CONFIG_RFKILL=m
 CONFIG_NFC=m
 CONFIG_PCI=y
diff --git a/modules.bzl b/modules.bzl
index c7678a0a4e41..6a14c5fcf746 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -60,11 +60,9 @@ COMMON_GKI_MODULES_LIST = [
     "net/ieee802154/ieee802154_socket.ko",
     "net/l2tp/l2tp_core.ko",
     "net/l2tp/l2tp_ppp.ko",
-    "net/mac80211/mac80211.ko",
     "net/mac802154/mac802154.ko",
     "net/nfc/nfc.ko",
     "net/rfkill/rfkill.ko",
     "net/tipc/diag.ko",
     "net/tipc/tipc.ko",
-    "net/wireless/cfg80211.ko",
 ]