diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index bb03db2fbc..a488b55d0a 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -147,9 +147,10 @@ config PRERAM_CBMEM_CONSOLE_SIZE
 config CBFS_MCACHE_SIZE
 	hex
 	depends on !NO_CBFS_MCACHE
-	default 0x2000
+	default 0x4000
 	help
-	  Increase this value if you see CBFS mcache overflow warnings.
+	  Increase this value if you see CBFS mcache overflow warnings. Do NOT
+	  change this value for vboot RW updates!
 
 config PC80_SYSTEM
 	bool
diff --git a/src/lib/Kconfig b/src/lib/Kconfig
index e1d56fe26b..239f613470 100644
--- a/src/lib/Kconfig
+++ b/src/lib/Kconfig
@@ -98,14 +98,3 @@ config NO_CBFS_MCACHE
 	  the associated CAR/SRAM size. In that case every single CBFS file
 	  lookup must re-read the same CBFS directory entries from flash to find
 	  the respective file.
-
-config CBFS_MCACHE_RW_PERCENTAGE
-	int
-	depends on VBOOT && !NO_CBFS_MCACHE
-	default 25 if CHROMEOS	# Chrome OS stores many L10n files in RO only
-	default 50
-	help
-	  The amount of the CBFS_MCACHE area that's used for the RW CBFS, in
-	  percent from 0 to 100. The remaining area will be used for the RO
-	  CBFS. Default is an even 50/50 split. When VBOOT is disabled, this
-	  will automatically be 0 (meaning the whole MCACHE is used for RO).
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 2fec5becee..3112672119 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -161,12 +161,4 @@ config VARIANT_HAS_MIPI_CAMERA
 	bool
 	default n
 
-config CBFS_MCACHE_RW_PERCENTAGE
-	int
-	default 50
-
-config CBFS_MCACHE_SIZE
-	hex
-	default 0x4000
-
 endif # BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index a39680d164..515efc7bef 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -235,6 +235,17 @@ config RWB_REGION_ONLY
 	  Add a space-delimited list of filenames that should only be in the
 	  RW-B section.
 
+config CBFS_MCACHE_RW_PERCENTAGE
+	int "Percentage of CBFS metadata cache used for RW CBFS"
+	depends on !NO_CBFS_MCACHE
+	default 50
+	help
+	  The amount of the CBFS_MCACHE area that's used for the RW CBFS, in
+	  percent from 0 to 100. The remaining area will be used for the RO
+	  CBFS. Default is an even 50/50 split. When VBOOT is disabled, this
+	  will automatically be 0 (meaning the whole MCACHE is used for RO).
+	  Do NOT change this value for vboot RW updates!
+
 config VBOOT_ENABLE_CBFS_FALLBACK
 	bool
 	default n