diff --git a/debian/changelog b/debian/changelog
index 35b0086..9f8379a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ calamares-settings-ubuntu (1:25.04.24) UNRELEASED; urgency=medium
     pkgselectprocess, not packages. This was preventing the OEM processing
     step (as opposed to just the GUI configuration) to be missing
     (LP: #2104343).
+  * [OEM] [Kubuntu] In stage two, ensure we use Wayland, consistent with the
+    rest of the session scripts.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 09 Apr 2025 01:55:07 -0500
 
diff --git a/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env b/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
index cedbc47..a40eedc 100755
--- a/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
+++ b/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
@@ -1,11 +1,15 @@
 #!/bin/bash
 # Starts the Kubuntu OEM Environment.
+export XDG_SESSION_CLASS="user"
+export XDG_SESSION_DESKTOP="KDE"
+export DESKTOP_SESSION="plasma"
 export QT_QPA_PLATFORMTHEME="kde"
 export BROWSER='sudo -H -u kubuntu firefox'
 
-/usr/bin/kwin_x11 &
+/usr/bin/kwin_wayland --no-lockscreen &
+while [ ! -e "/run/user/$(id -u)/wayland-0" ]; do sleep 1; done
 /usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/3840x2160.png &
-sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
+WAYLAND_DISPLAY="wayland-0" sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.
 # If it exits...
 killall basicwallpaper
-killall kwin_x11
+killall kwin_wayland