diff --git a/includes.container/etc/xdg/autostart/org.vanillaos.FirstSetup.nextBoot.desktop b/includes.container/etc/xdg/autostart/org.vanillaos.FirstSetup.nextBoot.desktop
new file mode 100644
index 0000000..d0a6fdb
--- /dev/null
+++ b/includes.container/etc/xdg/autostart/org.vanillaos.FirstSetup.nextBoot.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=FirstSetup Next Boot
+Comment=Run FirstSetup commands at the next boot
+Exec=sh -c vanilla-first-setup --run-post-script '/usr/bin/pkexec env REAL_USER=$USER /etc/org.vanillaos.FirstSetup.nextBoot'
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true
\ No newline at end of file