diff --git a/debian/calamares-settings-lubuntu.install b/debian/calamares-settings-lubuntu.install
index 385578b..c82a87f 100644
--- a/debian/calamares-settings-lubuntu.install
+++ b/debian/calamares-settings-lubuntu.install
@@ -7,5 +7,6 @@ lubuntu/modules/ etc/calamares/
 lubuntu/oem/calamares-launch-oem usr/bin/
 lubuntu/oem/calamares-launch-oem.desktop usr/share/applications/
 lubuntu/oem/calamares-oemprep.sh usr/libexec/
+lubuntu/oem/calamares-raspiprep.sh usr/libexec/
 lubuntu/oemconfig.tar.gz etc/calamares/
 lubuntu/settings.conf etc/calamares/
diff --git a/debian/changelog b/debian/changelog
index 6f2f1c2..3865cb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (1:25.04.2) UNRELEASED; urgency=medium
+
+  * Lubuntu: Add raspberry pi prep script
+
+ -- Erich Eickmeyer <eeickmeyer@ubuntu.com>  Sat, 09 Nov 2024 09:25:43 -0800
+
 calamares-settings-ubuntu (1:25.04.1) plucky; urgency=medium
 
   * Welcome to Plucky Puffin!
diff --git a/lubuntu/oem/calamares-raspiprep.sh b/lubuntu/oem/calamares-raspiprep.sh
new file mode 100644
index 0000000..371c5e0
--- /dev/null
+++ b/lubuntu/oem/calamares-raspiprep.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Preps the preinstalled system to go straight into
+# First user configuration mode, bypassing oem config
+# mode
+
+/usr/libexec/calamares-oemprep.sh
+
+sddm_file="$(cat <<EOL
+[Autologin]
+Session=lubuntu-oem-environment
+User=oem
+EOL
+)"
+
+echo "$sddm_file" > /etc/sddm.conf