diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 602fb8cacd28..532915f65ba3 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -318,7 +318,7 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
 CONFIG_WIREGUARD=y
 CONFIG_IFB=y
-CONFIG_MACSEC=y
+CONFIG_MACSEC=m
 CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_LED_TRIGGER_PHY=y
diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index fb3a5699bd75..909feec05bd9 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -289,7 +289,7 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
 CONFIG_WIREGUARD=y
 CONFIG_IFB=y
-CONFIG_MACSEC=y
+CONFIG_MACSEC=m
 CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_LED_TRIGGER_PHY=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index d5ce1c914981..20457fe457d4 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -307,7 +307,7 @@ CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
 CONFIG_WIREGUARD=y
 CONFIG_IFB=y
-CONFIG_MACSEC=y
+CONFIG_MACSEC=m
 CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_LED_TRIGGER_PHY=y
diff --git a/modules.bzl b/modules.bzl
index 8c4ccb5f3108..d79719bd3ad6 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -16,6 +16,7 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/net/can/dev/can-dev.ko",
     "drivers/net/can/slcan/slcan.ko",
     "drivers/net/can/vcan.ko",
+    "drivers/net/macsec.ko",
     "drivers/net/mii.ko",
     "drivers/net/ppp/bsd_comp.ko",
     "drivers/net/ppp/ppp_deflate.ko",