diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 98741da0..4af0d448 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -427,12 +427,17 @@ do_rootfs_finalize() {
             rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt
 
         mountpoint -q '${ROOTFSDIR}/dev' && \
-            umount -l ${ROOTFSDIR}/dev
+            umount -l -R ${ROOTFSDIR}/dev && \
+            rm -rf ${ROOTFSDIR}/dev/*
+
         mountpoint -q '${ROOTFSDIR}/proc' && \
             umount -l ${ROOTFSDIR}/proc
         mountpoint -q '${ROOTFSDIR}/sys' && \
             umount -l ${ROOTFSDIR}/sys
 
+        rm -rf ${ROOTFSDIR}/run/*
+        rm -f ${ROOTFSDIR}/vmlinuz.old
+
         if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then
             mv "${ROOTFSDIR}/etc/apt/sources-list" \
                 "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"