diff --git a/etc/.config/autostart/bluefin-firstboot.desktop b/etc/.config/autostart/bluefin-firstboot.desktop
new file mode 100644
index 00000000000..5b9905b257f
--- /dev/null
+++ b/etc/.config/autostart/bluefin-firstboot.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Bluefin First Boot Setup
+Comment=Sets up Ublue Desktop Correctly On FirstBoot
+Exec=/usr/bin/yafti /etc/yafti.yaml
+Icon=org.gnome.Terminal
+Type=Application
+Categories=Utility;System;
+Name[en_US]=startup