diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 018fd4fda860..c7901421909e 100644
--- a/android/gki_system_dlkm_modules
+++ b/android/gki_system_dlkm_modules
@@ -6,9 +6,17 @@ drivers/bluetooth/hci_uart.ko
 drivers/net/can/dev/can-dev.ko
 drivers/net/can/slcan/slcan.ko
 drivers/net/can/vcan.ko
+drivers/net/ppp/bsd_comp.ko
+drivers/net/ppp/ppp_deflate.ko
+drivers/net/ppp/ppp_generic.ko
+drivers/net/ppp/ppp_mppe.ko
+drivers/net/ppp/pppox.ko
+drivers/net/ppp/pptp.ko
+drivers/net/slip/slhc.ko
 drivers/usb/class/cdc-acm.ko
 drivers/usb/serial/ftdi_sio.ko
 drivers/usb/serial/usbserial.ko
+lib/crypto/libarc4.ko
 mm/zsmalloc.ko
 net/6lowpan/6lowpan.ko
 net/6lowpan/nhc_dest.ko
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 63f167a17cf6..ffe9362f1cf6 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -317,11 +317,11 @@ CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
-CONFIG_PPP=y
-CONFIG_PPP_BSDCOMP=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_USB_RTL8150=y
 CONFIG_USB_RTL8152=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 066dfb877351..f3d4d8a58d45 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -298,11 +298,11 @@ CONFIG_TUN=y
 CONFIG_VETH=y
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_SLCAN=m
-CONFIG_PPP=y
-CONFIG_PPP_BSDCOMP=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_MPPE=y
-CONFIG_PPTP=y
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_USB_RTL8150=y
 CONFIG_USB_RTL8152=y
diff --git a/modules.bzl b/modules.bzl
index 48b07e066c7c..bd436f3f93bc 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -8,9 +8,17 @@ COMMON_GKI_MODULES_LIST = [
     "drivers/net/can/dev/can-dev.ko",
     "drivers/net/can/slcan/slcan.ko",
     "drivers/net/can/vcan.ko",
+    "drivers/net/ppp/bsd_comp.ko",
+    "drivers/net/ppp/ppp_deflate.ko",
+    "drivers/net/ppp/ppp_generic.ko",
+    "drivers/net/ppp/ppp_mppe.ko",
+    "drivers/net/ppp/pppox.ko",
+    "drivers/net/ppp/pptp.ko",
+    "drivers/net/slip/slhc.ko",
     "drivers/usb/class/cdc-acm.ko",
     "drivers/usb/serial/ftdi_sio.ko",
     "drivers/usb/serial/usbserial.ko",
+    "lib/crypto/libarc4.ko",
     "mm/zsmalloc.ko",
     "net/6lowpan/6lowpan.ko",
     "net/6lowpan/nhc_dest.ko",