diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index 0ce27d0bcc4a05c6de23939b05988b81b8029727..37e882eaa1da1f1646f3a3139500ab8e6c3e4945 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -18,7 +18,7 @@ DISTRO_VERSION[vardepsexclude] = "DATE"
 SDK_VERSION[vardepsexclude] = "DATE"
 
 # Override these in oniro based distros
-ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch pam rauc security wayland vulkan virtualization"
+ONIRO_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch pam rauc security tpm tpm2 wayland vulkan virtualization"
 ONIRO_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
 ONIRO_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 
diff --git a/meta-oniro-core/conf/layer.conf b/meta-oniro-core/conf/layer.conf
index 5569deb94c8c0a32e5ef1163e0052dbf7b1c87a3..9c200ef13114fa5e5f6d13a250dcd2ae6096901b 100644
--- a/meta-oniro-core/conf/layer.conf
+++ b/meta-oniro-core/conf/layer.conf
@@ -20,6 +20,9 @@ LAYERDEPENDS_oniro-core = " \
     networking-layer \
     raspberrypi \
     rauc \
+    security \
+    tpm-layer \
+    tpm2 \
     "
 LAYERSERIES_COMPAT_oniro-core = "kirkstone"