diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 4bafeaf..8a3da11 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -5,10 +5,23 @@
 KERNEL_CLASSES ?= "kernel-fitimage"
 KERNEL_IMAGETYPES ?= "fitImage"
 
+# Static images. This is the default if no other layout is specified.
+IMAGE_FSTYPES += "${@bb.utils.contains_any('DISTRO_FEATURES', \
+        'obmc-ubi-fs phosphor-mmc', \
+        '', \
+        'mtd-static mtd-static-tar mtd-static-alltar', d)}"
+
+# UBI images.
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
         'obmc-ubi-fs', \
         'mtd-ubi mtd-ubi-tar', \
-        'mtd-static mtd-static-tar mtd-static-alltar', d)}"
+        '', d)}"
+
+# eMMC images.
+IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
+        'phosphor-mmc', \
+        'wic.xz mmc-ext4-tar', \
+        '', d)}"
 
 INITRAMFS_CTYPE ?= "xz"
 INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}"