diff --git a/BUILD.bazel b/BUILD.bazel
index 2a84a27ed59c..74a2ac4ccd66 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -38,6 +38,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_aarch64_modules b/android/gki_aarch64_modules
index 0898aebb6dfa..82fba98f24ee 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -9,6 +9,7 @@ drivers/usb/serial/ftdi_sio.ko
 net/can/can-raw.ko
 net/can/can-bcm.ko
 net/can/can-gw.ko
+net/8021q/8021q.ko
 net/wireless/cfg80211.ko
 net/mac80211/mac80211.ko
 net/tipc/tipc.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 74543c06f1cb..6914ee6b1900 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 0b92366b7a8b..aeb912ea22d2 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -233,7 +233,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 db62e3e9d6e6..a7b776dfc990 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -214,7 +214,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