diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample
index a387b6f5d7660f3991cb9bd7c7a3f4be06857757..63f7de3a1a4126dcecaa07a08a2b91785cd262d7 100644
--- a/flavours/linux/local.conf.sample
+++ b/flavours/linux/local.conf.sample
@@ -131,11 +131,8 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 #
 # Runtime testing of images
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index 35a1ec4978582d0319b364f656546bfeb8a04057..de9d877890fc70e6f05d092ededf626e0868b74e 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -134,11 +134,8 @@ PACKAGE_CLASSES ?= "package_rpm"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-mklibs' to reduce shared library files size for an image
 #   - 'image-prelink' in order to prelink the filesystem image
-# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
-# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 #
 # Runtime testing of images