diff --git a/classes/cve-filter.bbclass b/classes/cve-filter.bbclass
index 1fdc55c..390375d 100644
--- a/classes/cve-filter.bbclass
+++ b/classes/cve-filter.bbclass
@@ -80,12 +80,10 @@ python do_cve_filter (){
     bb.plain("DONE!!")
 }
 
-addtask cve_filter after do_image before do_image_complete
+addtask cve_filter after do_rootfs before do_image
 
-IMAGE_POSTPROCESS_COMMAND += "link_cvefilter_markdownfile;"
+ROOTFS_POSTPROCESS_COMMAND:prepend = "link_cvefilter_markdownfile; "
 
 link_cvefilter_markdownfile () {
-    if [ -e "${CVE_FILTER_MARKDOWN_FILE}" ]; then
-        ln -sf ${CVE_FILTER_MARKDOWN_FILE_NAME} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.md
-    fi
+    ln -sf ${CVE_FILTER_MARKDOWN_FILE_NAME} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.md
 }