diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index ae126d10e6c3..4775bb040082 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -10,12 +10,13 @@ drivers/bluetooth/hci_uart.ko
 drivers/bluetooth/btsdio.ko
 drivers/bluetooth/btbcm.ko
 drivers/bluetooth/btqca.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/ieee802154/6lowpan/ieee802154_6lowpan.ko
+net/can/can.ko
+net/can/can-raw.ko
+net/can/can-bcm.ko
+net/can/can-gw.ko
 net/bluetooth/bluetooth.ko
 net/bluetooth/rfcomm/rfcomm.ko
 net/bluetooth/hidp/hidp.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 0dbc00085b79..47592141f40b 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -22,6 +22,7 @@ net/8021q/8021q.ko
 net/bluetooth/bluetooth.ko
 net/bluetooth/hidp/hidp.ko
 net/bluetooth/rfcomm/rfcomm.ko
+net/can/can.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 f006910ba5a8..4fd196e5c3df 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -271,13 +271,9 @@ CONFIG_NET_ACT_SKBEDIT=y
 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=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 749702141d71..daefc7b5cd9c 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -252,13 +252,9 @@ CONFIG_NET_ACT_SKBEDIT=y
 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=m
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
diff --git a/modules.bzl b/modules.bzl
index f22ea22ef265..9625420b8326 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -24,6 +24,7 @@ COMMON_GKI_MODULES_LIST = [
     "net/bluetooth/bluetooth.ko",
     "net/bluetooth/hidp/hidp.ko",
     "net/bluetooth/rfcomm/rfcomm.ko",
+    "net/can/can.ko",
     "net/can/can-bcm.ko",
     "net/can/can-gw.ko",
     "net/can/can-raw.ko",