diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass
index 913aae4..3980120 100644
--- a/meta-phosphor/classes/image_types_phosphor.bbclass
+++ b/meta-phosphor/classes/image_types_phosphor.bbclass
@@ -181,7 +181,7 @@
 do_generate_ubi[depends] += " \
         ${PN}:do_image_${@d.getVar('FLASH_UBI_BASETYPE', True).replace('-', '_')} \
         virtual/kernel:do_deploy \
-        u-boot:do_populate_sysroot \
+        u-boot:do_deploy \
         mtd-utils-native:do_populate_sysroot \
         "
 
@@ -216,7 +216,7 @@
 do_make_ubi[depends] += " \
         ${PN}:do_image_${@d.getVar('FLASH_UBI_BASETYPE', True).replace('-', '_')} \
         virtual/kernel:do_deploy \
-        u-boot:do_populate_sysroot \
+        u-boot:do_deploy \
         mtd-utils-native:do_populate_sysroot \
         "
 
@@ -316,7 +316,7 @@
 do_generate_static[depends] += " \
         ${PN}:do_image_${@d.getVar('IMAGE_BASETYPE', True).replace('-', '_')} \
         virtual/kernel:do_deploy \
-        u-boot:do_populate_sysroot \
+        u-boot:do_deploy \
         "
 
 make_signatures() {
@@ -397,7 +397,7 @@
 do_generate_static_tar[depends] += " \
         ${PN}:do_image_${@d.getVar('IMAGE_BASETYPE', True).replace('-', '_')} \
         virtual/kernel:do_deploy \
-        u-boot:do_populate_sysroot \
+        u-boot:do_deploy \
         openssl-native:do_populate_sysroot \
         ${SIGNING_KEY_DEPENDS} \
         ${PN}:do_copy_signing_pubkey \
@@ -415,7 +415,7 @@
 do_generate_ubi_tar[depends] += " \
         ${PN}:do_image_${@d.getVar('FLASH_UBI_BASETYPE', True).replace('-', '_')} \
         virtual/kernel:do_deploy \
-        u-boot:do_populate_sysroot \
+        u-boot:do_deploy \
         openssl-native:do_populate_sysroot \
         ${SIGNING_KEY_DEPENDS} \
         ${PN}:do_copy_signing_pubkey \
@@ -459,11 +459,11 @@
         zstd-native:do_populate_sysroot \
         ${PN}:do_image_${FLASH_EXT4_BASETYPE} \
         virtual/kernel:do_deploy \
-        u-boot:do_populate_sysroot \
+        u-boot:do_deploy \
         openssl-native:do_populate_sysroot \
         ${SIGNING_KEY_DEPENDS} \
         ${PN}:do_copy_signing_pubkey \
-        phosphor-hostfw-image:do_populate_sysroot \
+        phosphor-hostfw-image:do_deploy \
         "
 
 def get_pubkey_basedir(d):