diff --git a/conf/machine/rainier.conf b/conf/machine/rainier.conf
index 1f8c21e..028f411 100644
--- a/conf/machine/rainier.conf
+++ b/conf/machine/rainier.conf
@@ -7,6 +7,8 @@
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
+require conf/distro/include/openpower-virtual-pnor.inc
+require conf/distro/include/phosphor-mmc.inc
 
 SERIAL_CONSOLES = "115200;ttyS4"
 
@@ -23,5 +25,4 @@
 PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
     "phosphor-fan-presence-config"
 
-FLASH_SIZE = "131072"
 SKIP_BROKEN_MRW = "1"
diff --git a/conf/machine/witherspoon-tacoma.conf b/conf/machine/witherspoon-tacoma.conf
index 4d94d9e..8f2d362 100644
--- a/conf/machine/witherspoon-tacoma.conf
+++ b/conf/machine/witherspoon-tacoma.conf
@@ -2,8 +2,6 @@
 UBOOT_MACHINE = "ast2600_openbmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-tacoma"
 
-IMAGE_FSTYPES += "ext4 mmc-ext4-tar"
-
 OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 
 MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:"
@@ -11,6 +9,8 @@
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
 require conf/machine/include/p9.inc
+require conf/distro/include/openpower-virtual-pnor.inc
+require conf/distro/include/phosphor-mmc.inc
 
 SERIAL_CONSOLES = "115200;ttyS4"
 
@@ -27,4 +27,9 @@
 PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
     "phosphor-fan-presence-config"
 
-FLASH_SIZE = "131072"
+# The eMMC on Tacoma is just 1GB smaller than Rainier. The template file
+# meta-aspeed/wic/emmc-aspeed.wks.in builds an image for the size of Rainier as
+# the default. To be able to re-use that template for Tacoma, the size of the
+# last partition (hostfw) was made configurable. The default size of the hostfw
+# partition is 5GB, therefore setting it to 4GB for Tacoma.
+WKS_HOSTFW_SIZE = "4G"