diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules
index 17e0e5bdb36f..8961cde5b6f9 100644
--- a/android/gki_aarch64_modules
+++ b/android/gki_aarch64_modules
@@ -3,6 +3,13 @@ drivers/block/zram/zram.ko
 drivers/net/can/dev/can-dev.ko
 drivers/net/can/vcan.ko
 drivers/net/can/slcan.ko
+drivers/net/ppp/ppp_generic.ko
+drivers/net/ppp/bsd_comp.ko
+drivers/net/ppp/ppp_deflate.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/usbserial.ko
 drivers/usb/serial/ftdi_sio.ko
@@ -38,3 +45,4 @@ net/ieee802154/ieee802154.ko
 net/ieee802154/ieee802154_socket.ko
 net/mac802154/mac802154.ko
 net/nfc/nfc.ko
+lib/crypto/libarc4.ko
diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules
index 8d7184069ee8..56604a8f8aa5 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.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 8704833e23fd..384281ea58e9 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -333,11 +333,11 @@ CONFIG_IFB=y
 CONFIG_MACSEC=y
 CONFIG_TUN=y
 CONFIG_VETH=y
-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 d541a0e7c3de..c0704267c670 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -306,11 +306,11 @@ CONFIG_IFB=y
 CONFIG_MACSEC=y
 CONFIG_TUN=y
 CONFIG_VETH=y
-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 f6c68a11f563..078eb711aac4 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.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",