diff --git a/BUILD.bazel b/BUILD.bazel
index d925f0475910..2a84a27ed59c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -42,6 +42,8 @@ _common_gki_modules_list = [
     "net/can/can-gw.ko",
     "net/can/can-raw.ko",
     "net/mac80211/mac80211.ko",
+    "net/tipc/diag.ko",
+    "net/tipc/tipc.ko",
     "net/wireless/cfg80211.ko",
 ]
 
diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index d4dbb8e2bd0b..0898aebb6dfa 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -11,3 +11,5 @@ net/can/can-bcm.ko
 net/can/can-gw.ko
 net/wireless/cfg80211.ko
 net/mac80211/mac80211.ko
+net/tipc/tipc.ko
+net/tipc/diag.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 3a80a849b6d2..74543c06f1cb 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -10,5 +10,7 @@ net/can/can-bcm.ko
 net/can/can-gw.ko
 net/can/can-raw.ko
 net/mac80211/mac80211.ko
+net/tipc/diag.ko
+net/tipc/tipc.ko
 net/wireless/cfg80211.ko
 
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 7904d0d29f6a..0b92366b7a8b 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -230,7 +230,7 @@ CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
-CONFIG_TIPC=y
+CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index a347a0869164..db62e3e9d6e6 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -211,7 +211,7 @@ CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
-CONFIG_TIPC=y
+CONFIG_TIPC=m
 CONFIG_L2TP=y
 CONFIG_BRIDGE=y
 CONFIG_VLAN_8021Q=y