diff --git a/ncs/Kconfig b/ncs/Kconfig
index 64eba031..ca2ceff8 100755
--- a/ncs/Kconfig
+++ b/ncs/Kconfig
@@ -27,12 +27,12 @@ config SUIT_ENVELOPE_HIERARCHICAL_MANIFEST
     select EXPERIMENTAL
     help
         Create hierarchical root manifest with it's dependent sub-manifests
-    default y
+    default n
 
 config SUIT_ENVELOPE_DEFAULT_TEMPLATE
     string "Path to the default envelope template (deprecated)"
     default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/default_app_rad_cores_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP && !SUIT_ENVELOPE_HIERARCHICAL_MANIFEST
-    default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/root_hierarchical_envelope.yaml.jinja2" if SUIT_ENVELOPE_HIERARCHICAL_MANIFEST
+    default "${ZEPHYR_SUIT_GENERATOR_MODULE_DIR}/ncs/root_hierarchical_envelope.yaml.jinja2" if SOC_NRF54H20_CPUAPP && SUIT_ENVELOPE_HIERARCHICAL_MANIFEST
     help
       Path to the root template, that is used if the application directory does not
       contain an input envelope template file.