diff --git a/flavours/freertos/local.conf.sample b/flavours/freertos/local.conf.sample
index eb0f5e8475f4099eaadc87f1c3735a830a83e51a..9b6d5f61fea11fff68d7fe6513ade0956019c860 100644
--- a/flavours/freertos/local.conf.sample
+++ b/flavours/freertos/local.conf.sample
@@ -63,11 +63,6 @@ PACKAGE_CLASSES ?= "package_rpm"
 #                     e.g. ssh root access has a blank password
 # There are other application targets that can be used here too, see
 # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-#
-# Building FreeRTOS using meta-freertos is currently failing without debug-tweaks!
-#
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index 1de45564871e5de6598e868f7858fefafcdd8674..3e763e9d4d73ef90fde4164b3cff58dc965baf36 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -125,8 +125,6 @@ PACKAGE_CLASSES ?= "package_rpm"
 #                     e.g. ssh root access has a blank password
 # There are other application targets that can be used here too, see
 # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
-# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 
 #
 # Additional image features