diff --git a/meta-phosphor/classes/image-overlay.bbclass b/meta-phosphor/classes/image-overlay.bbclass
index 1e2105c..443c271 100644
--- a/meta-phosphor/classes/image-overlay.bbclass
+++ b/meta-phosphor/classes/image-overlay.bbclass
@@ -63,6 +63,12 @@
 
 	# Maintain a number of non-standard name legacy links.
 	ln -sf $flash ${IMGDEPLOYDIR}/flash-${MACHINE}
+	ln -sf $flash ${IMGDEPLOYDIR}/image-bmc
+	ln -sf $uboot ${IMGDEPLOYDIR}/image-u-boot
+	ln -sf $kernel ${IMGDEPLOYDIR}/image-kernel
+	ln -sf $rootfs ${IMGDEPLOYDIR}/image-rofs
+	cp ${S}/$rwfs ${IMGDEPLOYDIR}/$rwfs
+	ln -sf $rwfs ${IMGDEPLOYDIR}/image-rwfs
 }
 
 make_overlay_tars() {