diff --git a/meta-refkit-core/conf/layer.conf b/meta-refkit-core/conf/layer.conf
index f0d1c687bf..c4721f0d73 100644
--- a/meta-refkit-core/conf/layer.conf
+++ b/meta-refkit-core/conf/layer.conf
@@ -8,6 +8,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 # Set a variable to get to the top of the IoT Reference OS Kit metadata location.
 META_REFKIT_CORE_BASE := '${LAYERDIR}'
 
+# Set a variable to get to the top of the metadata location
+IMAGE_DSK_BASE := '${LAYERDIR}'
+
 BBFILE_COLLECTIONS += "refkit-core"
 BBFILE_PATTERN_refkit-core = "^${LAYERDIR}/"
 BBFILE_PRIORITY_refkit-core = "6"
diff --git a/meta-refkit/conf/layer.conf b/meta-refkit/conf/layer.conf
index 4a7b638e1f..9ba5d9ecda 100644
--- a/meta-refkit/conf/layer.conf
+++ b/meta-refkit/conf/layer.conf
@@ -11,15 +11,9 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
         ${LAYERDIR}/fixes/*/recipes-*/*/*/*.bbappend \
 "
 
-# Set a variable to get to the top of the metadata location
-IMAGE_DSK_BASE := '${LAYERDIR}'
-
 # Set a variable to get to the top of the IoT Reference OS Kit metadata location.
 META_REFKIT_BASE := '${LAYERDIR}'
 
-# Used by image-dsk.bbclass to find lib/image-dsk.py.
-IMAGE_DSK_BASE ?= '${META_REFKIT_BASE}'
-
 # Required by stateless.bbclass to find patches needed only when
 # compiling stateless.
 STATELESS_PATCHES_BASE ?= "${META_REFKIT_BASE}/conf/distro/stateless-patches"