diff --git a/classes/phosphor-software-manager-ubi-fs.bbclass b/classes/phosphor-software-manager-ubi-fs.bbclass
index 6b0a78e..0280133 100644
--- a/classes/phosphor-software-manager-ubi-fs.bbclass
+++ b/classes/phosphor-software-manager-ubi-fs.bbclass
@@ -41,7 +41,10 @@
 BMC_RW_MTD ??= "bmc"
 BMC_RO_MTD ??= "bmc"
 BMC_KERNEL_MTD ??= "bmc"
+FLASH_SIZE ?= "32768"
+DISTROOVERRIDES .= ":flash-${FLASH_SIZE}"
 BMC_RW_SIZE ??= "0x600000"
+BMC_RW_SIZE_flash-131072 = "0x2000000"
 SYSTEMD_SUBSTITUTIONS += "RW_MTD:${BMC_RW_MTD}:obmc-flash-bmc-ubirw.service"
 SYSTEMD_SUBSTITUTIONS += "RO_MTD:${BMC_RO_MTD}:obmc-flash-bmc-ubiro@.service"
 SYSTEMD_SUBSTITUTIONS += "KERNEL_MTD:${BMC_KERNEL_MTD}:obmc-flash-bmc-ubiro@.service"