diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index e10c5623054e..3ae71e45392e 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -108,6 +108,7 @@ CONFIG_MODULE_SIG=y
 CONFIG_MODULE_SIG_PROTECT=y
 CONFIG_MODPROBE_PATH="/system/bin/modprobe"
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_WBT=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOPRIO=y
 CONFIG_BLK_INLINE_ENCRYPTION=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 12ae8c900ca6..da32d1f580ea 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -101,6 +101,7 @@ CONFIG_MODULE_SIG=y
 CONFIG_MODULE_SIG_PROTECT=y
 CONFIG_MODPROBE_PATH=""
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_WBT=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOPRIO=y
 CONFIG_BLK_INLINE_ENCRYPTION=y