diff --git a/meta-phosphor/conf/machine/include/image-type/mmc.inc b/meta-phosphor/conf/machine/include/image-type/mmc.inc
new file mode 100644
index 0000000..07d5db4
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/image-type/mmc.inc
@@ -0,0 +1,2 @@
+IMAGE_FSTYPES += "wic.xz mmc-ext4-tar"
+INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
diff --git a/meta-phosphor/conf/machine/include/image-type/static.inc b/meta-phosphor/conf/machine/include/image-type/static.inc
new file mode 100644
index 0000000..d714e1b
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/image-type/static.inc
@@ -0,0 +1,2 @@
+IMAGE_FSTYPES += "mtd-static mtd-static-tar mtd-static-alltar"
+INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
diff --git a/meta-phosphor/conf/machine/include/image-type/ubi-fs.inc b/meta-phosphor/conf/machine/include/image-type/ubi-fs.inc
new file mode 100644
index 0000000..62e66a6
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/image-type/ubi-fs.inc
@@ -0,0 +1,2 @@
+IMAGE_FSTYPES += "mtd-ubi mtd-ubi-tar"
+INITRAMFS_IMAGE = ""
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index 9098a8a..8a38343 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -5,25 +5,11 @@
 KERNEL_CLASSES ?= "kernel-fitimage"
 KERNEL_IMAGETYPES ?= "fitImage vmlinux"
 
-# 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)}"
+OBMC_IMAGE_INCLUDE = "static"
+OBMC_IMAGE_INCLUDE:df-obmc-ubi-fs = "ubi-fs"
+OBMC_IMAGE_INCLUDE:df-phosphor-mmc = "mmc"
 
-# UBI images.
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
-        'obmc-ubi-fs', \
-        'mtd-ubi mtd-ubi-tar', \
-        '', d)}"
-
-# eMMC images.
-IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \
-        'phosphor-mmc', \
-        'wic.xz mmc-ext4-tar', \
-        '', d)}"
+require conf/machine/include/image-type/${OBMC_IMAGE_INCLUDE}.inc
 
 INITRAMFS_CTYPE ?= "xz"
 INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}"
-INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
-INITRAMFS_IMAGE:df-obmc-ubi-fs = ""