diff --git a/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb b/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb
index b613576..7340498 100644
--- a/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb
+++ b/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb
@@ -2,5 +2,8 @@ DESCRIPTION = "An image that come with most of the feature available in CoreOS"
 
 inherit coreos-image
 
-IMAGE_FEATURES += "ssh-server podman dev-tools cockpit networkmanager swupdate"
-IMAGE_INSTALL:append = " packagegroup-core-full-cmdline swupdate-www"
+IMAGE_FEATURES += "ssh-server podman dev-tools cockpit networkmanager"
+IMAGE_FEATURES += "${@bb.utils.contains("MACHINE_FEATURES", "efi", "swupdate", "", d)}"
+
+IMAGE_INSTALL:append = " packagegroup-core-full-cmdline"
+IMAGE_INSTALL:append = "${@bb.utils.contains("IMAGE_FEATURES", "swupdate", " swupdate-www", "", d)}"