diff --git a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc
index 6703b00..dc83266 100644
--- a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc
+++ b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc
@@ -2,8 +2,10 @@
 IMAGE_FSTYPES += "container oci"
 IMGCLASSES:append = " image-oci"
 
-# Add an override that work for all container image
-MACHINEOVERRIDES =. "container:"
-
 # Containers don't need a kernel
 PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
+
+# When using coreos-image instead of coreos-container-image, we should skip
+# swu image generation and unified kernel image generation
+COREOS_IMAGE_GENERATE_UKI = "0"
+COREOS_IMAGE_GENERATE_SWU = "0"