diff --git a/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot b/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot
index 8dd07e4..594120a 100755
--- a/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot
+++ b/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot
@@ -29,6 +29,7 @@ systemctl enable bee-audit.service
 systemctl enable bee-web.service
 systemctl enable bee-sshsetup.service
 systemctl enable ssh.service
+systemctl enable lightdm.service 2>/dev/null || true
 systemctl enable qemu-guest-agent.service 2>/dev/null || true
 systemctl enable serial-getty@ttyS0.service 2>/dev/null || true
 systemctl enable serial-getty@ttyS1.service 2>/dev/null || true
diff --git a/iso/builder/config/package-lists/bee.list.chroot b/iso/builder/config/package-lists/bee.list.chroot
index e68f3cc..b250402 100644
--- a/iso/builder/config/package-lists/bee.list.chroot
+++ b/iso/builder/config/package-lists/bee.list.chroot
@@ -52,11 +52,11 @@ qrencode
 openbox
 tint2
 xorg
-xinit
 xterm
 chromium
 xserver-xorg-video-fbdev
 xserver-xorg-video-vesa
+lightdm
 
 # Firmware
 firmware-linux-free
diff --git a/iso/overlay/etc/lightdm/lightdm.conf.d/50-bee-autologin.conf b/iso/overlay/etc/lightdm/lightdm.conf.d/50-bee-autologin.conf
new file mode 100644
index 0000000..4d01324
--- /dev/null
+++ b/iso/overlay/etc/lightdm/lightdm.conf.d/50-bee-autologin.conf
@@ -0,0 +1,5 @@
+[Seat:*]
+autologin-user=bee
+autologin-user-timeout=0
+autologin-session=openbox
+user-session=openbox
diff --git a/iso/overlay/home/bee/.profile b/iso/overlay/home/bee/.profile
index ede49c4..ecd1535 100644
--- a/iso/overlay/home/bee/.profile
+++ b/iso/overlay/home/bee/.profile
@@ -1,10 +1 @@
 export PATH="/usr/local/bin:$PATH"
-
-# On tty1 (IPMI KVM console): start X desktop directly on VT1
-# so the KVM shows the graphical UI without switching VTs.
-if [ "$(tty 2>/dev/null)" = "/dev/tty1" ] \
-    && [ -z "${DISPLAY:-}" ]; then
-    startx /usr/local/bin/bee-openbox-session -- :0 vt1 -nolisten tcp
-    echo ""
-    echo "X session ended. Type 'startx' to retry or use the shell."
-fi
diff --git a/iso/overlay/usr/share/xsessions/openbox.desktop b/iso/overlay/usr/share/xsessions/openbox.desktop
new file mode 100644
index 0000000..0b1c0bf
--- /dev/null
+++ b/iso/overlay/usr/share/xsessions/openbox.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Openbox
+Comment=Bee Hardware Audit Desktop
+Exec=/usr/local/bin/bee-openbox-session
+TryExec=openbox
+Type=Application