diff --git a/recipes-kernel/linux/linux-hikey-aosp_4.4.bb b/recipes-kernel/linux/linux-hikey-aosp_4.4.bb
index 6f5071d4..4e8e9973 100644
--- a/recipes-kernel/linux/linux-hikey-aosp_4.4.bb
+++ b/recipes-kernel/linux/linux-hikey-aosp_4.4.bb
@@ -70,5 +70,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-aosp_4.9.bb b/recipes-kernel/linux/linux-hikey-aosp_4.9.bb
index 1c9714a3..2cd41395 100644
--- a/recipes-kernel/linux/linux-hikey-aosp_4.9.bb
+++ b/recipes-kernel/linux/linux-hikey-aosp_4.9.bb
@@ -69,5 +69,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-lt_4.4.bb b/recipes-kernel/linux/linux-hikey-lt_4.4.bb
index 88bc5f5a..4ffed7c9 100644
--- a/recipes-kernel/linux/linux-hikey-lt_4.4.bb
+++ b/recipes-kernel/linux/linux-hikey-lt_4.4.bb
@@ -71,5 +71,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-lts_4.4.bb b/recipes-kernel/linux/linux-hikey-lts_4.4.bb
index f39acd00..b1559e08 100644
--- a/recipes-kernel/linux/linux-hikey-lts_4.4.bb
+++ b/recipes-kernel/linux/linux-hikey-lts_4.4.bb
@@ -71,5 +71,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-mainline_git.bb b/recipes-kernel/linux/linux-hikey-mainline_git.bb
index 5868bc33..b3041d50 100644
--- a/recipes-kernel/linux/linux-hikey-mainline_git.bb
+++ b/recipes-kernel/linux/linux-hikey-mainline_git.bb
@@ -63,5 +63,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-next_git.bb b/recipes-kernel/linux/linux-hikey-next_git.bb
index 627fca0e..e9b8a9ea 100644
--- a/recipes-kernel/linux/linux-hikey-next_git.bb
+++ b/recipes-kernel/linux/linux-hikey-next_git.bb
@@ -63,5 +63,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-stable-rc_4.9.bb b/recipes-kernel/linux/linux-hikey-stable-rc_4.9.bb
index f63d363c..51f6be47 100644
--- a/recipes-kernel/linux/linux-hikey-stable-rc_4.9.bb
+++ b/recipes-kernel/linux/linux-hikey-stable-rc_4.9.bb
@@ -69,5 +69,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey-stable_4.9.bb b/recipes-kernel/linux/linux-hikey-stable_4.9.bb
index eee952f4..20938836 100644
--- a/recipes-kernel/linux/linux-hikey-stable_4.9.bb
+++ b/recipes-kernel/linux/linux-hikey-stable_4.9.bb
@@ -69,5 +69,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey960_git.bb b/recipes-kernel/linux/linux-hikey960_git.bb
index a60a6ada..9bb1842b 100644
--- a/recipes-kernel/linux/linux-hikey960_git.bb
+++ b/recipes-kernel/linux/linux-hikey960_git.bb
@@ -57,5 +57,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-hikey_git.bb b/recipes-kernel/linux/linux-hikey_git.bb
index 4e0b4193..a70c1a04 100644
--- a/recipes-kernel/linux/linux-hikey_git.bb
+++ b/recipes-kernel/linux/linux-hikey_git.bb
@@ -94,5 +94,5 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
diff --git a/recipes-kernel/linux/linux-poplar_git.bb b/recipes-kernel/linux/linux-poplar_git.bb
index 09e659c6..360979e5 100644
--- a/recipes-kernel/linux/linux-poplar_git.bb
+++ b/recipes-kernel/linux/linux-poplar_git.bb
@@ -57,7 +57,7 @@ do_configure() {
 
     bbplain "Saving defconfig to:\n${B}/defconfig"
     oe_runmake -C ${B} savedefconfig
-    cp -a ${B}/defconfig ${DEPLOYDIR}
+    cp -a ${B}/defconfig ${DEPLOY_DIR_IMAGE}
 }
 
 # Create a 128M boot image. block size is 1024. (128*1024=131072)