diff --git a/conf/distro/emlinux-common.inc b/conf/distro/emlinux-common.inc
index 1c9fddf1..ed3d9739 100644
--- a/conf/distro/emlinux-common.inc
+++ b/conf/distro/emlinux-common.inc
@@ -43,5 +43,5 @@ SDK_PREINSTALL += " \
   libssl-dev \
   libelf-dev"
 
-SDK_INSTALL += "linux-headers-${KERNEL_NAME}"
+SDK_INSTALL += "${@ "linux-headers-"+d.getVar('KERNEL_NAME') if d.getVar('KERNEL_NAME') else '' }"
 
diff --git a/recipes-core/images/emlinux-image-base.bb b/recipes-core/images/emlinux-image-base.bb
index 6a2f403f..dd000134 100644
--- a/recipes-core/images/emlinux-image-base.bb
+++ b/recipes-core/images/emlinux-image-base.bb
@@ -27,6 +27,7 @@ IMAGE_PREINSTALL:append = "\
   iputils-ping \
   procps \
   vim-tiny \
+  udev \
 "
 inherit image
 
diff --git a/recipes-core/images/emlinux-image-weston.bb b/recipes-core/images/emlinux-image-weston.bb
index 1ae22c36..5001c27f 100644
--- a/recipes-core/images/emlinux-image-weston.bb
+++ b/recipes-core/images/emlinux-image-weston.bb
@@ -17,8 +17,6 @@ IMAGE_PREINSTALL:append:trixie = " seatd"
 
 GROUPS += "weston-launch"
 GROUP_weston-launch[flags] = "system"
-GROUPS += "render"
-GROUP_render[flags] = "system"
 GROUPS += "wayland"
 GROUP_wayland[flags] = "system"