diff --git a/conf/machine/include/obmc-bsp-common.inc b/conf/machine/include/obmc-bsp-common.inc
index 63c5e1a..3c6bbc9 100644
--- a/conf/machine/include/obmc-bsp-common.inc
+++ b/conf/machine/include/obmc-bsp-common.inc
@@ -15,7 +15,8 @@
 
 INITRAMFS_CTYPE ?= "lzma"
 INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}"
-INITRAMFS_IMAGE = "obmc-phosphor-initramfs"
+INITRAMFS_IMAGE = "${@bb.utils.contains('MACHINE_FEATURES', \
+        'obmc-ubi-fs', '', 'obmc-phosphor-initramfs', d)}"
 
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"