diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass
index d9125d05..ce19ae1c 100644
--- a/meta/classes-recipe/image.bbclass
+++ b/meta/classes-recipe/image.bbclass
@@ -106,8 +106,8 @@ ROOTFS_FEATURES += "\
     "
 ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${@isar_multiarch_packages('IMAGE_INSTALL', d)}"
 ROOTFS_VARDEPS += "IMAGE_INSTALL"
-ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}"
-ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}"
+ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOYDIR}"
+ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOYDIR}"
 ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}"
 
 CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}"