diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
index b3b6247b..ec657177 100644
--- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -91,6 +91,7 @@ screens:
           default: false
           packages:
           - Install Sunshine: ujust install-sunshine
+          - Autostart Sunshine: ujust autostart-sunshine
         Wootility:
           description: A configurator for Wooting keyboards
           default: false
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
index 94d03514..91bc92e0 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
@@ -37,6 +37,11 @@ install-sunshine:
     flatpak run --command=additional-install.sh app/dev.lizardbyte.app.Sunshine/x86_64/stable
     echo "Sunshine is installed!"
 
+# Autostart Sunshine
+autostart-sunshine:
+    #!/usr/bin/env bash
+    systemctl enable --user --now sunshine.service
+
 # Install Decky Loader (https://github.com/SteamDeckHomebrew/decky-loader)
 get-decky:
     #!/usr/bin/env bash