diff --git a/chromium-setup/emmc-provisioning/cloud-init/config-files/99-default-session.conf b/chromium-setup/emmc-provisioning/cloud-init/config-files/99-default-session.conf
index 1ee4817..6f76496 100644
--- a/chromium-setup/emmc-provisioning/cloud-init/config-files/99-default-session.conf
+++ b/chromium-setup/emmc-provisioning/cloud-init/config-files/99-default-session.conf
@@ -1,2 +1,3 @@
 [Seat:*]
 user-session=plasmax11
+autologin-session=plasmax11
diff --git a/chromium-setup/emmc-provisioning/cloud-init/first-boot.sh b/chromium-setup/emmc-provisioning/cloud-init/first-boot.sh
index 6d56f2d..f49b6ce 100644
--- a/chromium-setup/emmc-provisioning/cloud-init/first-boot.sh
+++ b/chromium-setup/emmc-provisioning/cloud-init/first-boot.sh
@@ -107,6 +107,12 @@ if curl -fsSL "${FILE_SERVER}/99-default-session.conf" -o /etc/lightdm/lightdm.c
 else
   log "WARNING: Could not download 99-default-session.conf"
 fi
+# Raspberry Pi OS may apply main lightdm.conf after .conf.d; force session in main config too
+if [[ -f /etc/lightdm/lightdm.conf ]]; then
+  sed -i 's/^user-session=.*/user-session=plasmax11/' /etc/lightdm/lightdm.conf
+  sed -i 's/^autologin-session=.*/autologin-session=plasmax11/' /etc/lightdm/lightdm.conf
+  log "Patched /etc/lightdm/lightdm.conf to use plasmax11"
+fi
 
 # --- 5. KDE touch-friendly + Maliit (from file server) ---
 log "--- KDE and Maliit ---"