diff --git a/build-rpi.sh b/build-rpi.sh
index e3a9b09..eaa77f3 100755
--- a/build-rpi.sh
+++ b/build-rpi.sh
@@ -120,7 +120,10 @@ chmod +x ubuntusway-$architecture/hardware
 LANG=C.UTF-8 chroot ubuntusway-$architecture /hardware
 
 # Copy in any file overrides
-cp -rv "${rootdir}"/etc/config/includes.chroot/* ubuntusway-$architecture/
+cp -rv "${rootdir}"/etc/config/includes.chroot/etc/apt/ ubuntusway-$architecture/etc/
+cp -rv "${rootdir}"/etc/config/includes.chroot/etc/netplan/ ubuntusway-$architecture/etc/
+cp -rv "${rootdir}"/etc/config/includes.chroot/usr ubuntusway-$architecture/
+cp -rv "${rootdir}"/rpi/greetd/* ubuntusway-${architecture}/etc/greetd/
 
 mkdir ubuntusway-$architecture/hooks
 cp -v "${rootdir}"/etc/config/hooks/live/*.chroot ubuntusway-$architecture/hooks
@@ -134,12 +137,16 @@ done
 
 rm -r "ubuntusway-$architecture/hooks"
 
-# Create default user (WARNING! This is a temporary solution, until postinstall user setup is created)
+# Create OEM user
 cat <<EOF >> ubuntusway-$architecture/user
 #!/bin/bash
-adduser --disabled-password --gecos "" ubuntu
-echo "ubuntu:ubuntusway" | chpasswd
-usermod -a -G adm,dialout,cdrom,sudo,audio,video,plugdev,games,users,input,netdev ubuntu
+apt-get update
+apt-get -y install calamares-arm-oem
+DATE=$(date +%m%H%M%S)
+PASSWD=$(mkpasswd -m sha-512 oem "${DATE}")
+addgroup --gid 29999 oem
+adduser --gecos "OEM Configuration (temporary user)" --add_extra_groups --disabled-password --gid 29999 --uid 29999 oem
+usermod -a -G adm,sudo -p "${PASSWD}" oem
 rm -f user
 EOF
 
@@ -163,13 +170,11 @@ Requires=local-fs.target
 After=local-fs.target
 Before=swapfile.swap
 ConditionPathExists=!/swapfile
-
 [Service]
 Type=oneshot
 ExecStartPre=fallocate -l 1GiB /swapfile
 ExecStartPre=chmod 600 /swapfile
 ExecStart=mkswap /swapfile
-
 [Install]
 WantedBy=swap.target
 EOF
@@ -177,7 +182,6 @@ EOF
 cat <<EOF >> ubuntusway-$architecture/usr/lib/systemd/system/swapfile.swap
 [Unit]
 Description=The default swapfile
-
 [Swap]
 What=/swapfile
 EOF
diff --git a/rpi/greetd/config.toml b/rpi/greetd/config.toml
index c882bb9..9b00da8 100644
--- a/rpi/greetd/config.toml
+++ b/rpi/greetd/config.toml
@@ -3,7 +3,7 @@ vt = "next"
 
 [default_session]
 command = "tuigreet --remember --time --issue --asterisks --cmd sway"
-user = "greeter"
+user = "_greetd"
  
 [initial_session]
 command = "sway --config /etc/greetd/oem-setup"