diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 83f80e05caec..c3c85cdfe80a 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -373,7 +373,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_VSOC=y
-CONFIG_ION=y
+CONFIG_ION=m
 CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_XGENE is not set
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 180150509e48..7083fcba7936 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -323,7 +323,7 @@ CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
-CONFIG_ION=y
+CONFIG_ION=m
 CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_IIO=y
diff --git a/cuttlefish.fragment b/cuttlefish.fragment
index 99cc100dfd39..4db9bb12cbb7 100644
--- a/cuttlefish.fragment
+++ b/cuttlefish.fragment
@@ -17,3 +17,5 @@ CONFIG_RTC_DRV_TEST=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
+CONFIG_ION=m
+CONFIG_ION_SYSTEM_HEAP=y