diff --git a/BUILD.bazel b/BUILD.bazel
index 4c73fad5cb08..0ec4463d25d7 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -31,7 +31,13 @@ _aarch64_additional_kmi_symbol_lists = [
 _common_gki_modules_list = [
     # keep sorted
     "drivers/block/zram/zram.ko",
+    "drivers/net/can/dev/can-dev.ko",
+    "drivers/net/can/slcan.ko",
+    "drivers/net/can/vcan.ko",
     "mm/zsmalloc.ko",
+    "net/can/can-bcm.ko",
+    "net/can/can-gw.ko",
+    "net/can/can-raw.ko",
     "net/mac80211/mac80211.ko",
     "net/wireless/cfg80211.ko",
 ]
diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index f593d452cb69..fb7a74eeb2c5 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -1,4 +1,10 @@
 mm/zsmalloc.ko
 drivers/block/zram/zram.ko
+drivers/net/can/dev/can-dev.ko
+drivers/net/can/vcan.ko
+drivers/net/can/slcan.ko
+net/can/can-raw.ko
+net/can/can-bcm.ko
+net/can/can-gw.ko
 net/wireless/cfg80211.ko
 net/mac80211/mac80211.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 45ada864ba6b..51dd4101202f 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -1,4 +1,10 @@
 drivers/block/zram/zram.ko
+drivers/net/can/dev/can-dev.ko
+drivers/net/can/slcan.ko
+drivers/net/can/vcan.ko
 mm/zsmalloc.ko
+net/can/can-bcm.ko
+net/can/can-gw.ko
+net/can/can-raw.ko
 net/mac80211/mac80211.ko
 net/wireless/cfg80211.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 19100e3fb2ec..f573d60b7dfd 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -271,6 +271,12 @@ CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=y
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 35bef48028e4..7c4347701c63 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -252,6 +252,12 @@ CONFIG_NET_ACT_BPF=y
 CONFIG_VSOCKETS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=y
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y