diff --git a/classes/obmc-phosphor-image_types_uboot.bbclass b/classes/obmc-phosphor-image_types_uboot.bbclass
index 8b015da..7e543de 100644
--- a/classes/obmc-phosphor-image_types_uboot.bbclass
+++ b/classes/obmc-phosphor-image_types_uboot.bbclass
@@ -39,12 +39,9 @@
        ddir="${DEPLOY_DIR_IMAGE}"
        kernel="${FLASH_KERNEL_IMAGETYPE}"
        uboot="u-boot.${UBOOT_SUFFIX}"
-       initrd="${INITRD_LINK_NAME}.cpio.${INITRD_CTYPE}"
-       uinitrd="${initrd}.u-boot"
+       uinitrd="${INITRD_LINK_NAME}.cpio.${INITRD_CTYPE}.u-boot"
        rootfs="${IMAGE_LINK_NAME}.${IMAGE_BASETYPE}"
        rwfs="rwfs.${OVERLAY_BASETYPE}"
-       rofsimg=rofs.${IMAGE_BASETYPE}.cpio
-       netimg=initramfs-netboot.cpio
 
        if [ ! -f $ddir/$kernel ]; then
               bbfatal "Kernel file ${ddir}/${kernel} does not exist"
@@ -52,9 +49,6 @@
        if [ ! -f $ddir/$uboot ]; then
               bbfatal "U-boot file ${ddir}/${uboot} does not exist"
        fi
-       if [ ! -f $ddir/$initrd ]; then
-              bbfatal "initrd file ${ddir}/${initrd} does not exist"
-       fi
        if [ ! -f $ddir/$uinitrd ]; then
               bbfatal "uinitrd file ${ddir}/${uinitrd} does not exist"
        fi
@@ -89,13 +83,5 @@
 
        tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.all.tar -C ${ddir} image-bmc
        tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.tar -C ${ddir} image-u-boot image-kernel image-initramfs image-rofs image-rwfs
-
-       # Package the root image (rofs layer) with the initramfs for net booting.
-       # Uses the symlink above to get the desired name in the cpio
-       ( cd $ddir && echo image-rofs | cpio -oHnewc -L > ${rofsimg} )
-       # Prepend the rofs cpio -- being uncompressed it must be 4-byte aligned
-       cat ${ddir}/${rofsimg} ${ddir}/${initrd} > ${ddir}/${netimg}
-       oe_mkimage  "${netimg}" "${INITRD_CTYPE}"
-
 }
 do_generate_flash[vardepsexclude] = "DATETIME"
diff --git a/conf/machine/include/obmc-bsp-common.inc b/conf/machine/include/obmc-bsp-common.inc
index e52d8a3..657e54f 100644
--- a/conf/machine/include/obmc-bsp-common.inc
+++ b/conf/machine/include/obmc-bsp-common.inc
@@ -20,7 +20,7 @@
 IMAGE_CLASSES += "obmc-phosphor-image_types_uboot"
 
 INITRAMFS_CTYPE ?= "lzma"
-INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE} cpio.${INITRAMFS_CTYPE}.u-boot"
+INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot"
 
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"