diff --git a/recipes-core/images/core-image-base.bbappend b/recipes-core/images/core-image-base.bbappend
new file mode 100644
index 0000000..3ca85df
--- /dev/null
+++ b/recipes-core/images/core-image-base.bbappend
@@ -0,0 +1,2 @@
+IMAGE_BOOT_FILES:append:orange-pi-zero2w = " boot.scr ${KERNEL_DEVICETREE} allwinner/overlay/sun50i-h616-fixup.scr "
+IMAGE_INSTALL:append:orange-pi-zero2w = " uwe5622-firmware "
\ No newline at end of file
diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
deleted file mode 100644
index 606565d..0000000
--- a/recipes-core/images/core-image-minimal.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-IMAGE_BOOT_FILES:append = " boot.scr ${KERNEL_DEVICETREE} allwinner/overlay/sun50i-h616-fixup.scr "
-IMAGE_INSTALL:append = " uwe5622-firmware "
\ No newline at end of file
diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend
deleted file mode 100644
index 6b84baf..0000000
--- a/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:class-target = "opengl gallium"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index f2dfc23..1540f6d 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,5 +1,2 @@
 # Enable lima and panfrost Mesa drivers
 PACKAGECONFIG:append = " lima panfrost"
-# Enable KMS renderonly Mesa support
-# See https://cgit.freedesktop.org/mesa/mesa/commit/?id=2b780fe89300199f2334539aa1678e9b68f0434f
-GALLIUMDRIVERS:append = ",kmsro"