diff --git a/BUILD.bazel b/BUILD.bazel
index 6cb4aafe1e3d..ad3b3b6a2ab5 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -60,6 +60,22 @@ define_common_kernels(target_configs = {
         "kmi_symbol_list": "android/abi_gki_aarch64",
         "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
     },
+    # Sync with build.config.gki.x86_64
+    "kernel_x86_64": {
+        "kmi_symbol_list_strict_mode": False,
+        "module_implicit_outs": [
+            "drivers/block/zram/zram.ko",
+            "mm/zsmalloc.ko",
+        ],
+    },
+    # Sync with build.config.gki-debug.x86_64
+    "kernel_x86_64_debug": {
+        "kmi_symbol_list_strict_mode": False,
+        "module_implicit_outs": [
+            "drivers/block/zram/zram.ko",
+            "mm/zsmalloc.ko",
+        ],
+    },
 })
 
 # Sync with build.config.db845c
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 46972165fbaf..40bd1398c636 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -99,6 +99,7 @@ CONFIG_CLEANCACHE=y
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_AREAS=16
+CONFIG_ZSMALLOC=m
 # CONFIG_ZONE_DMA is not set
 CONFIG_ANON_VMA_NAME=y
 CONFIG_LRU_GEN=y
@@ -273,6 +274,7 @@ CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_FW_CACHE is not set
 CONFIG_GNSS=y
 CONFIG_OF=y
+CONFIG_ZRAM=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 CONFIG_BLK_DEV_RAM=y