diff --git a/BUILD.bazel b/BUILD.bazel
index 809c555d5051..932001e19545 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -30,6 +30,7 @@ _common_gki_modules_list = [
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",
     "mm/zsmalloc.ko",
+    "net/8021q/8021q.ko",
     "net/can/can-bcm.ko",
     "net/can/can-gw.ko",
     "net/can/can-raw.ko",
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 2a9ac5ca246c..f6518233d9ff 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -6,6 +6,7 @@ drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko
 mm/zsmalloc.ko
+net/8021q/8021q.ko
 net/can/can-bcm.ko
 net/can/can-gw.ko
 net/can/can-raw.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index d491f00a1342..f74d71ee0f22 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -215,7 +215,7 @@ CONFIG_IP6_NF_RAW=y
 CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
-CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q=m
 CONFIG_6LOWPAN=y
 CONFIG_IEEE802154=y
 CONFIG_IEEE802154_6LOWPAN=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 8880f3456be7..481110e55540 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -205,7 +205,7 @@ CONFIG_IP6_NF_RAW=y
 CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
-CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q=m
 CONFIG_6LOWPAN=y
 CONFIG_IEEE802154=y
 CONFIG_IEEE802154_6LOWPAN=y