diff --git a/usr/bin/archboot-launcher.sh b/usr/bin/archboot-launcher.sh
index 47ee76951..ea0aed10e 100755
--- a/usr/bin/archboot-launcher.sh
+++ b/usr/bin/archboot-launcher.sh
@@ -25,21 +25,11 @@ _desktop () {
     _EXIT=$(cat "${_ANSWER}")
     source /etc/locale.conf
     if [[ "${_EXIT}" == "GNOME" ]]; then
-        if _dialog --defaultno --yesno "Gnome Desktop:\nDo you want to use the Wayland Backend?" 6 45; then
-            clear
-            update -gnome-wayland
-        else
             clear
             update -gnome
-        fi
     elif [[ "${_EXIT}" == "PLASMA" ]]; then
-        if _dialog --defaultno --yesno "KDE/Plasma Desktop:\nDo you want to use the Wayland Backend?" 6 45; then
-            clear
-            update -plasma-wayland
-        else
             clear
             update -plasma
-        fi
     elif [[ "${_EXIT}" == "SWAY" ]]; then
         clear
         update -sway
diff --git a/usr/bin/archboot-update.sh b/usr/bin/archboot-update.sh
index 2f89c516b..d449af3ca 100755
--- a/usr/bin/archboot-update.sh
+++ b/usr/bin/archboot-update.sh
@@ -24,9 +24,7 @@ while [ $# -gt 0 ]; do
         -xfce|--xfce) _L_XFCE="1" ;;
         -sway|--sway) _L_SWAY="1" ;;
         -gnome|--gnome) _L_GNOME="1";;
-        -gnome-wayland|--gnome-wayland) _L_GNOME_WAYLAND="1";;
         -plasma|--plasma) _L_PLASMA="1" ;;
-        -plasma-wayland|--plasma-wayland) _L_PLASMA_WAYLAND="1" ;;
         -custom-xorg|--custom-xorg) _CUSTOM_X="1" ;;
         -custom-wayland|--custom-wayland) _CUSTOM_WAYLAND="1" ;;
         -full-system|--full-system) _FULL_SYSTEM="1" ;;
@@ -66,7 +64,7 @@ if [[ -n "${_CUSTOM_X}" || -n "${_CUSTOM_WAYLAND}" ]]; then
     _custom_wayland_xorg
 fi
 # Gnome, KDE/PLASMA or XFCE launch
-if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" || -n "${_L_GNOME_WAYLAND}" || -n "${_L_PLASMA_WAYLAND}" ]]; then
+if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}" ]]; then
     : > /.update
     _TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | Desktop Environment"
     [[ -e /var/cache/pacman/pkg/archboot.db ]] && : > /.graphic_installed
@@ -76,15 +74,9 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
     elif [[ -n "${_L_GNOME}" ]]; then
         _ENVIRONMENT="GNOME"
         _install_gnome | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
-    elif [[ -n "${_L_GNOME_WAYLAND}" ]]; then
-        _ENVIRONMENT="GNOME Wayland"
-        _install_gnome_wayland | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
     elif [[ -n "${_L_PLASMA}" ]];then
         _ENVIRONMENT="Plasma/KDE"
         _install_plasma | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
-    elif [[ -n "${_L_PLASMA_WAYLAND}" ]]; then
-        _ENVIRONMENT="Plasma/KDE Wayland"
-        _install_plasma_wayland | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
     elif [[ -n "${_L_SWAY}" ]]; then
         _ENVIRONMENT="Sway"
         _install_sway | _dialog --title "${_MENU_TITLE}" --gauge "Initializing ${_ENVIRONMENT}..." 6 75 0
@@ -102,18 +94,10 @@ if [[ -n "${_L_XFCE}" || -n "${_L_SWAY}" || -n "${_L_PLASMA}" || -n "${_L_GNOME}
     elif [[ -n "${_L_GNOME}" ]]; then
         _start_gnome | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
         clear
-        echo -e "To relaunch \e[1mGNOME\e[m desktop use: \e[92mstartx\e[m"
-    elif [[ -n "${_L_GNOME_WAYLAND}" ]]; then
-        _start_gnome_wayland | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
-        clear
         echo -e "To relaunch \e[1mGNOME Wayland\e[m use: \e[92mgnome-wayland\e[m"
     elif [[ -n "${_L_PLASMA}" ]]; then
         _start_plasma | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
         clear
-        echo -e "To relaunch \e[1mKDE/Plasma\e[m desktop use: \e[92mstartx\e[m"
-    elif [[ -n "${_L_PLASMA_WAYLAND}" ]]; then
-        _start_plasma_wayland | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
-        clear
         echo -e "To relaunch \e[1mKDE/Plasma Wayland\e[m use: \e[92mplasma-wayland\e[m"
     elif [[ -n "${_L_SWAY}" ]]; then
         _start_sway | _dialog --title "${_MENU_TITLE}" --gauge "Starting ${_ENVIRONMENT}..." 6 75 99
diff --git a/usr/lib/archboot/update/gnome.sh b/usr/lib/archboot/update/gnome.sh
index 5b22b490f..17e3b2033 100644
--- a/usr/lib/archboot/update/gnome.sh
+++ b/usr/lib/archboot/update/gnome.sh
@@ -33,31 +33,16 @@ _prepare_gnome() {
     fi
 }
 
-_install_gnome_wayland() {
+_install_gnome() {
     _PACKAGES="${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}"
     _prepare_gnome
 }
 
-_install_gnome() {
-    _PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_GNOME_PACKAGES}"
-    _prepare_gnome
-}
-
-_start_gnome_wayland() {
+_start_gnome() {
     _progress "100" "Launching GNOME Wayland now, logging is done on ${_LOG}..."
     sleep 2
     echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session >${_LOG} 2>&1" > /usr/bin/gnome-wayland
     chmod 755 /usr/bin/gnome-wayland
     gnome-wayland
 }
-
-_start_gnome() {
-    _progress "100" "Launching GNOME now, logging is done on ${_LOG}..."
-    sleep 2
-    echo "export XDG_SESSION_TYPE=x11" > /root/.xinitrc
-    #shellcheck disable=SC2129
-    echo "export GDK_BACKEND=x11" >> /root/.xinitrc
-    echo "exec dbus-launch gnome-session" >> /root/.xinitrc
-    startx >"${_LOG}" 2>&1
-}
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/archboot/update/plasma.sh b/usr/lib/archboot/update/plasma.sh
index de5ece562..9e9eea470 100644
--- a/usr/lib/archboot/update/plasma.sh
+++ b/usr/lib/archboot/update/plasma.sh
@@ -67,29 +67,17 @@ _prepare_plasma() {
     fi
 }
 
-_install_plasma_wayland() {
+_install_plasma() {
     _PACKAGES="${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_PLASMA_PACKAGES}"
     _prepare_plasma
 }
 
-_install_plasma() {
-    _PACKAGES="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_PLASMA_PACKAGES}"
-    _prepare_plasma
-}
 
-_start_plasma_wayland() {
+_start_plasma() {
     _progress "100" "Launching Plasma/KDE Wayland now, logging is done on ${_LOG}..."
     sleep 2
     echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session startplasma-wayland >${_LOG} 2>&1" > /usr/bin/plasma-wayland
     chmod 755 /usr/bin/plasma-wayland
     plasma-wayland
 }
-
-_start_plasma() {
-    _progress "100" "Launching Plasma/KDE now, logging is done on ${_LOG}..."
-    sleep 2
-    echo "export DESKTOP_SESSION=plasma" > /root/.xinitrc
-    echo "exec startplasma-x11" >> /root/.xinitrc
-    startx >"${_LOG}" 2>&1
-}
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/archboot/update/update.sh b/usr/lib/archboot/update/update.sh
index 024e5f171..66a717050 100644
--- a/usr/lib/archboot/update/update.sh
+++ b/usr/lib/archboot/update/update.sh
@@ -22,10 +22,8 @@ _MENU_TITLE=" Logging to ${_VC} | ${_LOG} "
 
 _graphic_options() {
     if ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
-        echo -e " \e[1m-gnome\e[m           Launch Gnome desktop with VNC sharing enabled."
-        echo -e " \e[1m-gnome-wayland\e[m   Launch Gnome desktop with Wayland backend."
-        echo -e " \e[1m-plasma\e[m          Launch KDE Plasma desktop with VNC sharing enabled."
-        echo -e " \e[1m-plasma-wayland\e[m  Launch KDE Plasma desktop with Wayland backend."
+        echo -e " \e[1m-gnome\e[m   Launch Gnome desktop with Wayland backend."
+        echo -e " \e[1m-plasma\e[m  Launch KDE Plasma desktop with Wayland backend."
     fi
 }