diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample
index 7b5272defbf022773d04e4aa08d30e4f697ba427..cdcc60ca4646c1d8d6f355f48ab2fb24416f0d3d 100644
--- a/flavours/linux/local.conf.sample
+++ b/flavours/linux/local.conf.sample
@@ -131,8 +131,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-prelink' in order to prelink the filesystem image
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 
 #
 # Runtime testing of images
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index 667247ba8a6c512ca66852086db461c13107fc35..5f191b576c1b0c2201a040e7c3d05d70da8076a5 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -134,8 +134,7 @@ PACKAGE_CLASSES ?= "package_rpm"
 # enable extra features. Some available options which can be included in this variable
 # are:
 #   - 'buildstats' collect build statistics
-#   - 'image-prelink' in order to prelink the filesystem image
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 
 #
 # Runtime testing of images