diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index ed5bcda7..8bbba462 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -11,40 +11,19 @@ screens:
       description: |
         Configure your system to get started
   configure-bazzite-arch:
-    source: yafti.screen.package
+    source: yafti.screen.consent
     values:
-      title: Configure Bazzite Arch
+      title: Setting up Bazzite-Arch
       condition:
         run: grep -qv "bazzite-arch" <<< $(distrobox list)
-      show_terminal: true
-      package_manager: yafti.plugin.run
-      groups:
-        Install Bazzite Arch:
-          description: This will install an Arch distrobox configured for gaming
-          default: true
-          packages:
-          - Install Bazzite Arch: just --unstable install-bazzite-arch
-        Export Launchers:
-          description: This exports Steam and Lutris
-          default: true
-          packages:
-          - Export Steam: distrobox-enter -n bazzite-arch -- '  distrobox-export --app steam'
-          - Export Lutris: distrobox-enter -n bazzite-arch -- '  distrobox-export --app lutris'
-        Export Utilities:
-          description: This exports SteamCMD and protontricks
-          default: true
-          packages:
-          - Export SteamCMD: just --unstable export-steamcmd
-          - Export Protontricks: distrobox-enter -n bazzite-arch -- '  distrobox-export --app protontricks'
-        Autostart Steam:
-          description: Starts Steam after logging in
-          default: true
-          packages:
-          - Autostart Steam: cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/.config/autostart/bazzite-arch-steam-silent.desktop && sed -i 's@/usr/bin/steam-runtime  %U@/usr/bin/steam-runtime -silent %U@g' ~/.config/autostart/bazzite-arch-steam-silent.desktop
+      description: |
+        Sets up a custom Arch Linux OCI in Distrobox that Steam, Lutris, and other gaming workloads will be run inside of
+      actions:
+      - run: just --unstable install-bazzite-arch
   configure-bazzite:
     source: yafti.screen.package
     values:
-      title: Configure Bazzite
+      title: Setting up Bazzite
       show_terminal: true
       package_manager: yafti.plugin.run
       groups:
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index d5b1081b..2b9ffaf7 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -8,6 +8,18 @@ install-bazzite-arch:
     echo 'Installing Bazzite Arch...'
     distrobox assemble create --file /usr/share/ublue-os/distrobox/bazzite-arch
   fi
+  distrobox-enter -n bazzite-arch -- '  distrobox-export --app steam'
+  cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/.config/autostart/bazzite-arch-steam-silent.desktop
+  sed -i 's@/usr/bin/steam-runtime  %U@/usr/bin/steam-runtime -silent %U@g' ~/.config/autostart/bazzite-arch-steam-silent.desktop
+  distrobox-enter -n bazzite-arch -- '  distrobox-export --app lutris'
+  distrobox-enter -n bazzite-arch -- '  distrobox-export --app protontricks'
+  mkdir -p ~/.steam
+  distrobox-enter -n bazzite-arch -- '  distrobox-export --bin steamcmd --export-path ~/.steam'
+  ln -s ~/.steam/steamcmd ~/.steam/steamcmd.sh
+  if [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
+    cp ~/.local/share/applications/bazzite-arch-steam.desktop ~/Desktop
+    cp ~/.local/share/applications/bazzite-arch-lutris.desktop ~/Desktop
+  fi
 
 install-corectrl:
   echo 'Installing CoreCtrl...''