diff --git a/kas/kas-security-base.yml b/kas/kas-security-base.yml
index 811c551..7096d09 100644
--- a/kas/kas-security-base.yml
+++ b/kas/kas-security-base.yml
@@ -51,7 +51,8 @@ local_conf_header:
     EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
     PACKAGE_CLASSES = "package_ipk"
 
-    DISTRO_FEATURES_append = " pam tpm tpm2 apparmor smack"
+    DISTRO_FEATURES_append = " pam apparmor smack"
+    MACHINE_FEATURES_append = " tpm tpm2"
 
   diskmon: |
     BB_DISKMON_DIRS = "\