diff --git a/BUILD.bazel b/BUILD.bazel
index 10b8caaeca05..652896c8f1f9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -24,6 +24,8 @@ define_common_kernels(target_configs = {
         "module_implicit_outs": [
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
+            "net/wireless/cfg80211.ko",
+            "net/mac80211/mac80211.ko",
         ],
     },
     # Sync with build.config.gki.aarch64.16k
@@ -31,6 +33,8 @@ define_common_kernels(target_configs = {
         "module_implicit_outs": [
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
+            "net/wireless/cfg80211.ko",
+            "net/mac80211/mac80211.ko",
         ],
     },
     # Sync with build.config.gki-debug.aarch64
@@ -38,6 +42,8 @@ define_common_kernels(target_configs = {
         "module_implicit_outs": [
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
+            "net/wireless/cfg80211.ko",
+            "net/mac80211/mac80211.ko",
         ],
     },
     # Sync with build.config.gki.x86_64
@@ -46,6 +52,8 @@ define_common_kernels(target_configs = {
         "module_implicit_outs": [
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
+            "net/wireless/cfg80211.ko",
+            "net/mac80211/mac80211.ko",
         ],
     },
     # Sync with build.config.gki-debug.x86_64
@@ -54,6 +62,8 @@ define_common_kernels(target_configs = {
         "module_implicit_outs": [
             "drivers/block/zram/zram.ko",
             "mm/zsmalloc.ko",
+            "net/wireless/cfg80211.ko",
+            "net/mac80211/mac80211.ko",
         ],
     },
 })
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 83e76f59600e..f593d452cb69 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -1,2 +1,4 @@
-drivers/block/zram/zram.ko
 mm/zsmalloc.ko
+drivers/block/zram/zram.ko
+net/wireless/cfg80211.ko
+net/mac80211/mac80211.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index d61d59ef807e..1e29aad5212f 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -263,11 +263,11 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_DEFAULT_PS is not set
 # CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=y
+CONFIG_MAC80211=m
 CONFIG_RFKILL=y
 CONFIG_NFC=y
 CONFIG_PCI=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 569cb8f7ecb1..afd17b1d8c9d 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -253,11 +253,11 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 # CONFIG_CFG80211_DEFAULT_PS is not set
 # CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=y
+CONFIG_MAC80211=m
 CONFIG_RFKILL=y
 CONFIG_NFC=y
 CONFIG_PCI=y