diff --git a/Containerfile b/Containerfile
index 0769943..e40ea7c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,7 +7,6 @@ FROM ghcr.io/ublue-os/silverblue-main:${FEDORA_MAJOR_VERSION}
 COPY etc /etc
 # COPY usr /usr
 
-COPY ublue-firstboot /usr/bin
 COPY recipe.yml /etc/ublue-recipe.yml
 
 # yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml
diff --git a/build.sh b/build.sh
index 45bdb84..897789e 100644
--- a/build.sh
+++ b/build.sh
@@ -7,4 +7,7 @@ for pkg in $rpm_packages; do \
     echo "Installing: ${pkg}" && \
     rpm-ostree install $pkg; \
 done
-echo "---"
\ No newline at end of file
+echo "---"
+
+# install yafti to install flatpaks on first boot, https://github.com/ublue-os/yafti
+pip install --prefix=/usr yafti
\ No newline at end of file
diff --git a/etc/profile.d/ublue-firstboot.sh b/etc/profile.d/ublue-firstboot.sh
index 2340d8a..62818cd 100644
--- a/etc/profile.d/ublue-firstboot.sh
+++ b/etc/profile.d/ublue-firstboot.sh
@@ -1,6 +1,6 @@
 if test "$(id -u)" -gt "0" && test -d "$HOME"; then
-    if test ! -e "$HOME"/.config/ublue/firstboot-done; then
+    if test ! -e "$HOME"/.config/autostart/ublue-firstboot.desktop; then
         mkdir -p "$HOME"/.config/autostart
         cp -f /etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
     fi
-fi
+fi
\ No newline at end of file
diff --git a/etc/skel.d/.config/autostart/ublue-firstboot.desktop b/etc/skel.d/.config/autostart/ublue-firstboot.desktop
index eb1636d..94e94d2 100644
--- a/etc/skel.d/.config/autostart/ublue-firstboot.desktop
+++ b/etc/skel.d/.config/autostart/ublue-firstboot.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Ublue Desktop FirstBoot Setup
-Comment=Sets up Ublue Desktop Correctly On FirstBoot
-Exec=/usr/bin/ublue-firstboot
+Name=uBlue First Boot Setup
+Comment=Sets up uBlue Desktop Correctly On FirstBoot
+Exec=/usr/bin/yafti /etc/yafti.yml
 Icon=org.gnome.Terminal
 Type=Application
 Categories=Utility;System;
-Name[en_US]=startup
+Name[en_US]=startup
\ No newline at end of file