diff --git a/configs/focal-gnome-desktop b/configs/focal-gnome-desktop
new file mode 100644
index 0000000..86aad26
--- /dev/null
+++ b/configs/focal-gnome-desktop
@@ -0,0 +1,7 @@
+allow_root_login() {
+    echo true
+}
+
+get_default_apt_options() {
+	echo "-y"
+}
diff --git a/configs/focal-gnome-desktop.packages b/configs/focal-gnome-desktop.packages
new file mode 100644
index 0000000..fc6b07f
--- /dev/null
+++ b/configs/focal-gnome-desktop.packages
@@ -0,0 +1,5 @@
+ubuntu-gnome-desktop
+openssh-server
+neofetch
+net-tools
+netplan.io
diff --git a/face.png b/face.png
new file mode 100644
index 0000000..cef2bb5
Binary files /dev/null and b/face.png differ
diff --git a/fixups/S90-desktop b/fixups/S90-desktop
new file mode 100755
index 0000000..6417eb7
--- /dev/null
+++ b/fixups/S90-desktop
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+[ -f /etc/default/desktop ] || exit 0
+
+. /etc/default/desktop
+
+case ${SESSION} in
+	ubuntu-wayland)
+		if [ -f /tmp/face.png ]; then
+			echo "I: copy default display picture for GDM"
+			cp -a /tmp/face.png /home/@@DEFAULT_USER@@/.face
+		fi
+		cat>/var/lib/AccountsService/users/@@DEFAULT_USER@@<<__EOF
+[User]
+Session=${SESSION}
+XSession=${SESSION}
+Icon=/home/@@DEFAULT_USER@@/.face
+SystemAccount=false
+__EOF
+		chown root:root /var/lib/AccountsService/users/@@DEFAULT_USER@@
+		;;
+esac
diff --git a/flavour/focal/gnome-desktop/overlay/etc/default/desktop b/flavour/focal/gnome-desktop/overlay/etc/default/desktop
new file mode 100644
index 0000000..482dbc1
--- /dev/null
+++ b/flavour/focal/gnome-desktop/overlay/etc/default/desktop
@@ -0,0 +1 @@
+SESSION=ubuntu-wayland
diff --git a/functions b/functions
index 9b77b06..d9ecfd5 100644
--- a/functions
+++ b/functions
@@ -365,6 +365,19 @@ do_preinstall() {
     [ -d ${TOPDIR}/boards/${BOARD}/fixups ] \
         && rsync -a ${TOPDIR}/boards/${BOARD}/fixups/* ${rootfs_mnt}/${fixups_dir}
 
+    case ${FLAVOUR} in
+        *-desktop*)
+            faceimage=${TOPDIR}/face.png
+            if [ -f ${TOPDIR}/boards/${BOARD}/face.png ]; then
+                faceimage=${TOPDIR}/boards/${BOARD}/face.png
+            elif [ -f ${TOPDIR}/custom/${CUSTOMOS}/face.png ]; then
+                faceimage=${TOPDIR}/custom/${CUSTOMOS}/face.png
+            fi
+
+            cp -a ${faceimage} ${rootfs_mnt}/tmp
+            ;;
+    esac
+
     FIXUPS=`ls -A1 ${rootfs_mnt}${fixups_dir}/*`
     for fixup in ${FIXUPS}; do
         sed -i \
@@ -402,6 +415,7 @@ do_postinstall() {
     if [ ! "x${QEMU_BINARY}" = "x" ]; then
         rm -f ${rootfs_mnt}/${QEMU_BINARY}
     fi
+    rm -f ${rootfs_mnt}/tmp/face.png
     rm -rf ${rootfs_mnt}${fixups_dir}
     rm -rf ${rootfs_mnt}/etc/apt/sources.list.d/ppa_linuxfactory_or_kr.list
 }