diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
index 954aaf3..336697b 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
@@ -1,6 +1,3 @@
-BMC_RW_MTD = "pnor"
-# TODO Use the primary and alternate BMC chips to store the read-only
-# and kernel images once these issues are closed openbmc/openbmc#1942
-# and openbmc/openbmc#1791
-#BMC_RO_MTD = "alt"
-#BMC_KERNEL_MTD = "bmc"
+BMC_RW_MTD = "bmc"
+BMC_RO_MTD = "alt-bmc+bmc"
+BMC_KERNEL_MTD = "bmc"
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
index e287797..324474b 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -76,11 +76,9 @@
     "
 
 # Name of the mtd device where the ubi volumes should be created
-BMC_RW_MTD ??= "pnor"
-BMC_RO_MTD ??= "pnor"
-# TODO Change kernel location to primary BMC chip once the rofs/rwfs mtd devices
-# are merged into a single ubi one openbmc/openbmc#1942
-BMC_KERNEL_MTD ??= "pnor"
+BMC_RW_MTD ??= "bmc"
+BMC_RO_MTD ??= "bmc"
+BMC_KERNEL_MTD ??= "bmc"
 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"