diff --git a/files/usr/lib/systemd/user/firstboot-setup.service b/files/usr/lib/systemd/user/firstboot-setup.service
index 68eb3c9..12cc01d 100644
--- a/files/usr/lib/systemd/user/firstboot-setup.service
+++ b/files/usr/lib/systemd/user/firstboot-setup.service
@@ -5,8 +5,10 @@ Wants=xdg-desktop-autostart.target
 ConditionPathExists=%h/.config/firstboot/run
 
 [Service]
-Type=exec
+Type=simple
 ExecStart=%h/.config/firstboot/wait-and-run.sh
+PassEnvironment=DISPLAY WAYLAND_DISPLAY XDG_SESSION_TYPE
+
 
 [Install]
 WantedBy=xdg-desktop-autostart.target