diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass
index 2b412f93..7e286e79 100644
--- a/meta-isar/classes/ubi-ubifs-img.bbclass
+++ b/meta-isar/classes/ubi-ubifs-img.bbclass
@@ -12,4 +12,9 @@ IMAGE_CMD:ubi_ubifs() {
     # we need to produce output (with extension .ubi-ubifs),
     # so just create a symlink
     ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs
+
+    bbwarn "ubi-ubifs-img image type is deprecated, please use built-in image"\
+           "classes instead:\n"\
+           "IMAGE_TYPEDEP:ubi += \"ubifs fit\"\n"\
+           "IMAGE_FSTYPES ?= \"ubi ubifs\""
 }
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c730eec9..90fd570c 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -350,3 +350,12 @@ def deb_list_beautify(d, varname):
         if stripped:
             var_list.append(stripped)
     return ', '.join(var_list)
+
+# Deprecation checking
+python deprecation_checking() {
+    if d.getVar('MACHINE') == 'imx6-sabrelite':
+        bb.warn("Target imx6-sabrelite is deprecated and will be removed soon")
+}
+
+deprecation_checking[vardepsexclude] += "MACHINE"
+do_unpack[prefuncs] += "deprecation_checking"