diff --git a/flavours/linux/bblayers.conf.sample b/flavours/linux/bblayers.conf.sample
index efef18fdbfe8cc4242907a7517db1c5fb101e162..4cdb9e292e73d75a6f693acddec0611ddf1e774b 100644
--- a/flavours/linux/bblayers.conf.sample
+++ b/flavours/linux/bblayers.conf.sample
@@ -10,7 +10,7 @@
 # ONIRO_REQUIRED_LAYERS_CONF_VERSION, update the value below to the
 # required one after you have merged in all the changes from the sample file.
 
-ONIRO_LAYERS_CONF_VERSION = "1"
+ONIRO_LAYERS_CONF_VERSION = "2"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
@@ -37,9 +37,17 @@ BBLAYERS ?= " \
   ##OEROOT##/../meta-openembedded/meta-python \
   ##OEROOT##/../meta-raspberrypi \
   ##OEROOT##/../meta-security \
+  ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-riscv \
   ##OEROOT##/../meta-rauc \
   ##OEROOT##/../meta-java \
   ##OEROOT##/../meta-seco-rockchip \
   ##OEROOT##/../meta-virtualization \
+  ##OEROOT##/../meta-ts/meta-trustedsubstrate \
+  ##OEROOT##/../meta-ledge-secure/meta-ledge-secure \
+  ##OEROOT##/../meta-secure-core/meta \
+  ##OEROOT##/../meta-secure-core/meta-efi-secure-boot \
+  ##OEROOT##/../meta-secure-core/meta-encrypted-storage \
+  ##OEROOT##/../meta-secure-core/meta-signing-key \
+  ##OEROOT##/../meta-secure-core/meta-tpm2 \
   "
diff --git a/meta-oniro-core/conf/distro/include/oniro.inc b/meta-oniro-core/conf/distro/include/oniro.inc
index 12e14f5e5b3a6f34709dec942146263b9638ae31..dd5200c5d3ddbd471841d2d8c09d08b910c9905e 100644
--- a/meta-oniro-core/conf/distro/include/oniro.inc
+++ b/meta-oniro-core/conf/distro/include/oniro.inc
@@ -18,7 +18,7 @@ BB_DANGLINGAPPENDS_WARNONLY:forcevariable = "0"
 
 # Bump this each time bblayers.conf.sample changes incompatibly. For example,
 # when integrating new layers.
-ONIRO_REQUIRED_LAYERS_CONF_VERSION = "1"
+ONIRO_REQUIRED_LAYERS_CONF_VERSION = "2"
 # oe-core's sanity check sanity_check_conffiles function only runs the
 # functions in BBLAYERS_CONF_UPDATE_FUNCS when the associated variable is not
 # None. Making sure this variable has a default value, we force running the