diff --git a/layers/meta-nwl-distro/classes/nwl-image.bbclass b/layers/meta-nwl-distro/classes/nwl-image.bbclass
index f468c02..dec4772 100644
--- a/layers/meta-nwl-distro/classes/nwl-image.bbclass
+++ b/layers/meta-nwl-distro/classes/nwl-image.bbclass
@@ -1,8 +1,2 @@
-# Remove EFI support for machines which don't support it
-EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}"
-COREOS_IMAGE_GENERATE_UKI = "${EFI}"
-COREOS_IMAGE_GENERATE_INSTALLER = "${EFI}"
-COREOS_IMAGE_GENERATE_SWU = "${EFI}"
-
 # Base classe for all image based on NWL
 inherit coreos-image