diff --git a/conf/distro/guf-wayland-no-gplv3.conf b/conf/distro/guf-wayland-no-gplv3.conf
index c8e593f34ddd6818b11acc791970acf23776b8c1..d905588af4e24172ddbc8fdf07a705ed8f40d099 100644
--- a/conf/distro/guf-wayland-no-gplv3.conf
+++ b/conf/distro/guf-wayland-no-gplv3.conf
@@ -1,25 +1,5 @@
-# GUF Distro for Wayland.
+require conf/distro/guf-wayland.conf
 
-require conf/distro/include/guf-base.inc
-
-DISTRO = "guf-wayland-no-gplv3"
-DISTRO_NAME = "GUF Wayland (without GPLv3)"
-
-DISTRO_FEATURES_remove = "bluetooth bluez5 gobject-introspection-data pulseaudio directfb x11"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "bluetooth bluez5 gobject-introspection-data pulseaudio"
-
-# Add support for wayland
-DISTRO_FEATURES_append = " wayland"
-
-# Add opengl
-DISTRO_FEATURES_append = " opengl vulkan"
-
-# Default is busybox
-# Recommandation from poky/meta-poky/conf/local.conf.sample.extended
-# expect syslog which is replaced by syslog-ng
-PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils"
-VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
-VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
-VIRTUAL-RUNTIME_base-utils-syslog = "syslog-ng"
-VIRTUAL-RUNTIME_vim = "vim"
+# Remove support for GPLv3
+DISTRO_FEATURES_remove = "gplv3"
 
diff --git a/conf/distro/guf-wayland.conf b/conf/distro/guf-wayland.conf
index f848964895a30000d1595226a9bd28943d409801..9b33b898e0299a2dbae3bd838f54ef8f87296bba 100644
--- a/conf/distro/guf-wayland.conf
+++ b/conf/distro/guf-wayland.conf
@@ -15,7 +15,7 @@ DISTRO_FEATURES_append = " wayland"
 DISTRO_FEATURES_append = " opengl vulkan"
 
 # Add support for GPLv3
-DISTRO_FEATURES_append = " gplv3"
+DISTRO_FEATURES += "gplv3"
 
 # Default is busybox
 # Recommandation from poky/meta-poky/conf/local.conf.sample.extended