diff --git a/classes/meta-virt-cfg.bbclass b/classes/meta-virt-cfg.bbclass
index bf63a06f..a20f9fea 100644
--- a/classes/meta-virt-cfg.bbclass
+++ b/classes/meta-virt-cfg.bbclass
@@ -3,4 +3,4 @@
 # layer.conf load time, we delay using a special bbclass that simply includes
 # the META_VIRT_CONFIG_PATH file.
 
-include ${META_VIRT_CONFIG_PATH}
\ No newline at end of file
+include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${META_VIRT_CONFIG_PATH}', '', d)}
diff --git a/classes/meta-virt-k8s-cfg.bbclass b/classes/meta-virt-k8s-cfg.bbclass
index 1be0a5c8..f1d7f81e 100644
--- a/classes/meta-virt-k8s-cfg.bbclass
+++ b/classes/meta-virt-k8s-cfg.bbclass
@@ -3,4 +3,4 @@
 # layer.conf load time, we delay using a special bbclass that simply includes
 # the K8S_CONFIG_PATH file.
 
-include ${K8S_CONFIG_PATH}
+include ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', '${K8S_CONFIG_PATH}', '', d)}
diff --git a/conf/layer.conf b/conf/layer.conf
index d0a7ead0..922cb0d6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -46,5 +46,5 @@ INHERIT += "sanity-meta-virt"
 # the META_VIRT_CONFIG_PATH file, and likewise for the k8s configs
 META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc"
 K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc"
-USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}"
-USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', 'meta-virt-k8s-cfg', '', d)}"
+USER_CLASSES_append = " meta-virt-cfg"
+USER_CLASSES_append = " meta-virt-k8s-cfg"