diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index cad15a8..ef53b1a 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -342,4 +342,9 @@ The bitbake variable defines the respective environment variable which is availa
 When cross compiling, `cross` is added to the `DEB_BUILD_PROFILES` environment variable.
 Please note, that manually exported versions of the variables are overwritten.
 
-For a list of well-known Debian build profiles and common practices, we refer to Debian's BuildProfileSpec.
\ No newline at end of file
+For a list of well-known Debian build profiles and common practices, we refer to Debian's BuildProfileSpec.
+
+### Move do_copy_boot_files task after do_rootfs_postprocess
+
+The boot-files(kernel, initrd, dtbs) are now shipped to tmp/deploy/images after
+do_rootfs_postprocess task and before do_rootfs_finalize task.
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 6d77243..d70a93b 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -170,7 +170,7 @@ do_copy_boot_files() {
         cp -f "$dtb" "${DEPLOY_DIR_IMAGE}/"
     done
 }
-addtask copy_boot_files before do_rootfs_postprocess after do_rootfs_install
+addtask copy_boot_files before do_rootfs_finalize after do_rootfs_postprocess
 
 python do_image_tools() {
     """Virtual task"""