diff --git a/projects/Generic/devices/Generic-legacy/options b/projects/Generic/devices/Generic-legacy/options
deleted file mode 100644
index faeb0f0d86..0000000000
--- a/projects/Generic/devices/Generic-legacy/options
+++ /dev/null
@@ -1,19 +0,0 @@
-# OpenGL(X) implementation to use (mesa / no)
-  OPENGL="mesa"
-
-# OpenGL-ES implementation to use (mesa / no)
-  OPENGLES="no"
-
-# Displayserver to use (weston / x11 / no)
-  DISPLAYSERVER="x11"
-
-# KODI Player implementation to use (mesa / default)
-  KODIPLAYER_DRIVER="default"
-
-# set the addon project
-  ADDON_PROJECT="Generic"
-
-# Mesa 3D / Xorg Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,nvidia,nvidia-legacy,vmware,virtio)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia nvidia-legacy vmware virtio"
-  GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia nvidia-legacy vmware virtio"
diff --git a/projects/Generic/devices/Generic-legacy/options b/projects/Generic/devices/Generic-legacy/options
new file mode 120000
index 0000000000..54f3bbcf77
--- /dev/null
+++ b/projects/Generic/devices/Generic-legacy/options
@@ -0,0 +1 @@
+../x11/options
\ No newline at end of file
diff --git a/projects/Generic/devices/gbm/options b/projects/Generic/devices/gbm/options
new file mode 120000
index 0000000000..a3070700b7
--- /dev/null
+++ b/projects/Generic/devices/gbm/options
@@ -0,0 +1 @@
+../Generic/options
\ No newline at end of file
diff --git a/projects/Generic/devices/wayland/options b/projects/Generic/devices/wayland/options
new file mode 100644
index 0000000000..5c937c0006
--- /dev/null
+++ b/projects/Generic/devices/wayland/options
@@ -0,0 +1,19 @@
+# OpenGL(X) implementation to use (mesa / no)
+  OPENGL="no"
+
+# OpenGL-ES implementation to use (mesa / no)
+  OPENGLES="mesa"
+
+# Displayserver to use (weston / x11 / no)
+  DISPLAYSERVER="weston"
+
+# KODI Player implementation to use (mesa / default)
+  KODIPLAYER_DRIVER="mesa"
+
+# set the addon project
+  ADDON_PROJECT="Generic"
+
+# Mesa 3D Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,vmware,virtio)
+# Space separated list is supported,
+# e.g. GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi vmware virtio"
+  GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi vmware virtio"
diff --git a/projects/Generic/devices/Generic-legacy/filesystem/etc/X11/xorg-i915.conf b/projects/Generic/devices/x11/filesystem/etc/X11/xorg-i915.conf
similarity index 100%
rename from projects/Generic/devices/Generic-legacy/filesystem/etc/X11/xorg-i915.conf
rename to projects/Generic/devices/x11/filesystem/etc/X11/xorg-i915.conf
diff --git a/projects/Generic/devices/Generic-legacy/filesystem/usr/bin/intel-fullrange.sh b/projects/Generic/devices/x11/filesystem/usr/bin/intel-fullrange.sh
similarity index 100%
rename from projects/Generic/devices/Generic-legacy/filesystem/usr/bin/intel-fullrange.sh
rename to projects/Generic/devices/x11/filesystem/usr/bin/intel-fullrange.sh
diff --git a/projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service b/projects/Generic/devices/x11/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
similarity index 100%
rename from projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
rename to projects/Generic/devices/x11/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service
diff --git a/projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange.service b/projects/Generic/devices/x11/filesystem/usr/lib/systemd/system/intel-fullrange.service
similarity index 100%
rename from projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange.service
rename to projects/Generic/devices/x11/filesystem/usr/lib/systemd/system/intel-fullrange.service
diff --git a/projects/Generic/devices/x11/options b/projects/Generic/devices/x11/options
new file mode 100644
index 0000000000..faeb0f0d86
--- /dev/null
+++ b/projects/Generic/devices/x11/options
@@ -0,0 +1,19 @@
+# OpenGL(X) implementation to use (mesa / no)
+  OPENGL="mesa"
+
+# OpenGL-ES implementation to use (mesa / no)
+  OPENGLES="no"
+
+# Displayserver to use (weston / x11 / no)
+  DISPLAYSERVER="x11"
+
+# KODI Player implementation to use (mesa / default)
+  KODIPLAYER_DRIVER="default"
+
+# set the addon project
+  ADDON_PROJECT="Generic"
+
+# Mesa 3D / Xorg Graphic drivers to use (all / crocus,i915,iris,r300,r600,radeonsi,nvidia,nvidia-legacy,vmware,virtio)
+# Space separated list is supported,
+# e.g. GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia nvidia-legacy vmware virtio"
+  GRAPHIC_DRIVERS="crocus i915 iris r300 r600 radeonsi nvidia nvidia-legacy vmware virtio"
diff --git a/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh b/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh
index cc25de5bfe..e7c9bf418f 100644
--- a/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh
+++ b/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 # Allow upgrades between different Generic builds
-if [ "$1" = "Virtual.x86_64" -o "$1" = "Generic-legacy.x86_64" -o "$1" = "Generic.x86_64" ]; then
+if [ "$1" = "Virtual.x86_64" -o "$1" = "Generic.x86_64" -o "$1" = "gbm.x86_64" -o "$1" = "wayland.x86_64" -o "$1" = "x11.x86_64" ]; then
   exit 0
 else
   exit 1