diff --git a/Containerfile b/Containerfile
index 6cbb9e0142..eaf7cc1072 100644
--- a/Containerfile
+++ b/Containerfile
@@ -299,8 +299,6 @@ RUN --mount=type=cache,dst=/var/cache \
     systemctl mask systemd-remount-fs.service && \
     mkdir -p /usr/lib/extest/ && \
     /ctx/ghcurl "$(/ctx/ghcurl https://api.github.com/repos/ublue-os/extest/releases/latest | jq -r '.assets[] | select(.name| test(".*so$")).browser_download_url')" -Lo /usr/lib/extest/libextest.so && \
-    /ctx/ghcurl "https://github.com/ykshek/Sunshine/raw/1347f9ef290c089b815cf186f7d361470bdb9ef7/src_assets/linux/misc/postinst" -Lo /usr/libexec/sunshine-postinst && \
-    chmod +x /usr/libexec/sunshine-postinst && \
     setfattr -n user.component -v "extest" /usr/lib/extest/libextest.so && \
     mkdir -p /etc/xdg/autostart && \
     sed -i~ -E 's/=.\$\(command -v (nft|ip6?tables-legacy).*/=/g' /usr/lib/waydroid/data/scripts/waydroid-net.sh && \
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-sunshine.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-sunshine.just
index 7d3adc539c..81236adc1b 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-sunshine.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-sunshine.just
@@ -1,6 +1,4 @@
-# vim: set ft=make :
-
-# Setup and configure Sunshine Game Streaming host. Options: status | enable | enable-beta | update | disable | uninstall | portal | virtual-monitor
+# Setup and configure Sunshine Game Streaming host. Options: status | enable | enable-deck | update | disable | uninstall | portal | virtual-monitor
 [group("gaming")]
 setup-sunshine ACTION="":
     #!/usr/bin/bash
@@ -12,46 +10,50 @@ setup-sunshine ACTION="":
       read -r reply
       [[ -z "$reply" || "${reply,,}" =~ ^y ]]
     }
+
     press_any_key() {
       echo "Press Enter to continue..."
       read -r
     }
+
     sunshine_installed() {
       flatpak info dev.lizardbyte.app.Sunshine >/dev/null 2>&1
     }
+
+    deck_sunshine_installed() {
+      rpm -q sunshine >/dev/null 2>&1
+    }
+    # deck_sunshine refers to the layered installs of sunshine, as it is primarily for deck users who do not have access to xdg portal capture.
+
     brew_sunshine_installed() {
       [[ -e /home/linuxbrew/.linuxbrew/opt/sunshine ||
         -d /home/linuxbrew/.linuxbrew/Cellar/sunshine ||
         -e /home/linuxbrew/.linuxbrew/opt/sunshine-beta ||
         -d /home/linuxbrew/.linuxbrew/Cellar/sunshine-beta ]]
     }
+
     get_status_token() {
-      local flatpak_service_state beta_service_state service_state
-      flatpak_service_state="$(systemctl is-enabled --user app-dev.lizardbyte.app.Sunshine 2>/dev/null || true)"
-      if [[ "$flatpak_service_state" == "enabled" ]]; then
-        echo "enable"
+      local service_state
+      service_state="$(systemctl is-enabled --user app-dev.lizardbyte.app.Sunshine 2>/dev/null || true)"
+
+      if sunshine_installed; then
+        local status="enable"
+      elif deck_sunshine_installed; then
+        local status="enable-deck"
       elif brew_sunshine_installed; then
-        echo "enable-brew"
-      elif sunshine_installed; then
-        echo "disable"
+        local status="enable-brew"
       else
         echo "uninstall"
+        return
       fi
-    }
-    override_service() {
-      servicefile="[Unit]
-    After=graphical-session.target xdg-desktop-autostart.target xdg-desktop-portal.service
 
-    [Service]
-    ExecStartPre=/bin/sleep 5
-    ExecStopPost=/usr/libexec/sunshine-stop-vmon
-    Restart=on-failure
-    RestartSec=5s
-    "
-      if [[ $(systemctl --user cat homebrew.sunshine-beta | grep sleep 2>/dev/null || true) == "" ||  $(systemctl --user cat homebrew.sunshine-beta | grep sleep 2>/dev/null || true) == "" ]]; then
-        systemctl --user edit --stdin homebrew.sunshine-beta <<< "$servicefile"
+      if [[ "$service_state" == "enabled" ]]; then
+        echo "$status"
+      else
+        echo "disable"
       fi
     }
+
     virtual-monitor() {
       local FLATPAK_VMON_APP='{
         "auto-detach": true,
@@ -112,6 +114,7 @@ setup-sunshine ACTION="":
         echo "Virtual monitors are only supported in KDE's KWin compositor!"
         echo "See ${bold}https://docs.bazzite.gg/Advanced/custom_resolution/${normal} for more information."
         press_any_key
+        return 0
       fi
       local MON_OPTION=$(Choose "Add Virtual Monitor" "Fix Error 503" "Go Back" "Exit")
       case "$MON_OPTION" in
@@ -139,17 +142,34 @@ setup-sunshine ACTION="":
         ;;
         "Fix Error 503")
           echo "KWIN_WAYLAND_NO_PERMISSION_CHECKS=1" > $HOME/.config/environment.d/98-kwin-no-permission-checks.conf
-          echo -n "Wrote in $HOME/.config/environment.d/98-kwin-no-permission-checks: "
+          echo -n "Wrote in $HOME/.config/environment.d/98-kwin-no-permission-checks.conf: "
           cat $HOME/.config/environment.d/98-kwin-no-permission-checks.conf
         ;;
         "Go Back")
-          ujust setup-sunshine
+          return 0
         ;;
         *)
+          exit 0
         ;;
       esac
     }
 
+    yeet_brew() {
+      echo "${b}You may ignore the following errors as they are just cosmetic.${n}"
+      if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+      fi
+      brew trust LizardByte/homebrew
+      brew tap LizardByte/homebrew
+      brew services stop sunshine 2>/dev/null || true
+      brew unpin sunshine 2>/dev/null || true
+      brew uninstall sunshine 2>/dev/null || true
+      brew services stop sunshine-beta 2>/dev/null || true
+      brew unpin sunshine-beta 2>/dev/null || true
+      brew uninstall sunshine-beta 2>/dev/null || true
+      brew untap LizardByte/homebrew 2>/dev/null || true
+    }
+
     if [ "$OPTION" == "help" ]; then
       echo "Usage: ujust setup-sunshine <option>"
       echo "  <option>: Specify the quick option to skip the prompt"
@@ -164,173 +184,148 @@ setup-sunshine ACTION="":
     elif [ "$OPTION" == "status" ]; then
       get_status_token
       exit $?
-    elif [ "$OPTION" == "" ]; then
-      case "$(get_status_token)" in
-        "enable-brew")
-          SERVICE_STATE="${yellow}${b}Enabled (Brew)${n}"
-          ;;
-        "enable")
-          SERVICE_STATE="${green}${b}Enabled${n}"
-          ;;
-        "uninstall")
-          SERVICE_STATE="${red}${b}Not Installed${n}"
-          ;;
-        *)
-          SERVICE_STATE="${yellow}${b}Disabled${n}"
-          ;;
-      esac
-      echo "Service is $SERVICE_STATE"
-      OPTION=$(Choose "Enable" "Enable Beta" "Update" "Disable Service" "Uninstall" "Open Portal" "Configure Virtual Monitor" "Exit")
     fi
-    if [[ "${OPTION,,}" =~ ^enable[-[:space:]]beta ]]; then
-      if [[ $(cat /etc/bazzite/image_name) =~ deck ]]; then
-        echo "You are about to install the experimental ${yellow}Sunshine Beta${n} package via brew."
-        echo "If you encounter issues with the ${yellow}Sunshine Beta${n} brew package, consider layering from either the official or community-maintained COPR."
-        echo "Read ${b}http://docs.bazzite.gg/Advanced/sunshine/#setting-up-sunshine-on-deck-images${n} to learn more."
-      else
-        echo "This option is primarily intended for users of the Deck image as the flatpak package does not support capture via Kernel Mode Setting."
-        echo "Installing ${yellow}Sunshine${n} stable with the ${b}'Enable Sunshine'${n} option is going to be better for just about everyone else."
-        echo "You may also use this to install ${yellow}Sunshine Beta${n} as Sunshine does not provide a beta repo for their flatpak."
-        echo "Alternatively, you may also install sunshine by: "
-        echo "  1) obtaining and installing the beta flatpak manually from their GitHub repository;"
-        echo "  2) layering from either the official or community-maintained COPR."
-        echo "Only proceed if you know what you are doing. Read ${b}http://docs.bazzite.gg/Advanced/sunshine/#installing-sunshine-beta${n} to learn more."
+      while true; do
+      if [ "$OPTION" == "" ]; then
+        case "$(get_status_token)" in
+          "enable-deck")
+            SERVICE_STATE="${yellow}${b}Enabled (Deck)${n}"
+            ;;
+          "enable")
+            SERVICE_STATE="${green}${b}Enabled${n}"
+            ;;
+          "uninstall")
+            SERVICE_STATE="${red}${b}Not Installed${n}"
+            ;;
+          *)
+            SERVICE_STATE="${yellow}${b}Disabled${n}"
+            ;;
+        esac
+        echo "Service is $SERVICE_STATE"
+        OPTION=$(Choose "Enable" "Enable-Deck" "Disable Service" "Uninstall" "Open Portal" "Configure Virtual Monitor" "Exit")
       fi
-      echo ""
-      if confirm "Confirm to proceed with installing the ${b}experimental${n} ${yellow}Sunshine Beta${n} package via brew? (This will remove any existing Sunshine installation!)"; then
-        echo "Disabling any previous ${yellow}Sunshine${n} services..."
-        systemctl --user disable --now app-dev.lizardbyte.app.Sunshine.service || true
-        if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
-          echo "Setting up Homebrew environment..."
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-        fi
-        brew trust LizardByte/homebrew
-        brew tap LizardByte/homebrew
-        echo "${b}Cleaning${n} up any existing stable ${yellow}Sunshine${n} install before installing beta..."
-        flatpak run --command=remove-additional-install.sh dev.lizardbyte.app.Sunshine || true
-        flatpak uninstall -y dev.lizardbyte.app.Sunshine || true
-        brew services stop sunshine || true
-        brew unpin sunshine || true
-        brew uninstall sunshine || true
-        brew install sunshine-beta
-        brew pin sunshine-beta
-        if ! sunshine_bin="$(command -v sunshine)"; then
-          echo "${yellow}Sunshine${n} was not found on PATH after installation." >&2
-          exit 1
-        fi
-        sudo /usr/libexec/sunshine-postinst
-        if [[ $(cat /etc/bazzite/image_name) =~ deck ]]; then
-          echo "${b}Deck Image detected.${n} Automatically configuring options for streaming on Game Mode..."
-          SUNSHINE_CONF="$HOME/.config/sunshine/sunshine.conf"
-          mkdir -p "$(dirname "$SUNSHINE_CONF")"
-          if grep -q "^capture" "$SUNSHINE_CONF" 2>/dev/null; then
-            sed -i 's/^capture=.*/capture = kms/' "$SUNSHINE_CONF"
-          else
-            echo "capture = kms" >> "$SUNSHINE_CONF"
+      OPTION="${OPTION,,}"
+
+      case "$OPTION" in
+        enable-deck|"enable deck"|enable_deck)
+          if [[ "$(get_status_token)" =~ "disable" ]]; then
+            echo "Enabling service..."
+            systemctl --user enable --now app-dev.lizardbyte.app.Sunshine
+            press_any_key
+            exit 0
           fi
-          if grep -q "^system_tray" "$SUNSHINE_CONF" 2>/dev/null; then
-            sed -i 's/^system_tray=.*/system_tray = disabled/' "$SUNSHINE_CONF"
+          if [[ $(cat /etc/bazzite/image_name) =~ deck ]]; then
+            echo "You are about to layer the ${yellow}Sunshine${n} package via rpm-ostree."
+            echo "If you encounter issues with ${b}system updates${n}, reset ostree and try layering it again."
+            echo "Read ${b}https://docs.bazzite.gg/Advanced/sunshine/#__tabbed_1_2${n} to learn more."
           else
-            echo "system_tray = disabled" >> "$SUNSHINE_CONF"
+            echo "This option is primarily intended for users of the Deck image as the flatpak package does not support capture via Kernel Mode Setting."
+            echo "Installing ${yellow}Sunshine${n} stable with the normal ${b}'Enable Sunshine'${n} option will be better unless you encounter issues with XDG Portal/KWin Screencast capture options or need HDR."
+            echo "Only proceed if you know what you are doing. Read ${b}https://docs.bazzite.gg/Advanced/sunshine/#__tabbed_1_2${n} to learn more."
+          fi
+          echo ""
+          if confirm "Confirm to proceed with layering ${yellow}Sunshine${n}? (This will remove all existing Sunshine installations!)"; then
+            echo "Disabling any previous ${yellow}Sunshine${n} services..."
+            systemctl --user disable --now app-dev.lizardbyte.app.Sunshine || true
+            echo "${b}Cleaning${n} up any existing stable ${yellow}Sunshine${n} installs before layering..."
+            yeet_brew
+            flatpak run --command=remove-additional-install.sh dev.lizardbyte.app.Sunshine || true
+            flatpak uninstall -y dev.lizardbyte.app.Sunshine || true
+            rpm-ostree install sunshine
+            if [[ $(cat /etc/bazzite/image_name) =~ deck ]]; then
+              echo "${b}Deck Image detected.${n} Automatically configuring options for streaming on Game Mode..."
+              SUNSHINE_CONF="$HOME/.config/sunshine/sunshine.conf"
+              mkdir -p "$(dirname "$SUNSHINE_CONF")"
+              if grep -q "^capture" "$SUNSHINE_CONF" 2>/dev/null; then
+                sed -i 's/^capture=.*/capture = kms/' "$SUNSHINE_CONF"
+              else
+                echo "capture = kms" >> "$SUNSHINE_CONF"
+              fi
+              if grep -q "^system_tray" "$SUNSHINE_CONF" 2>/dev/null; then
+                sed -i 's/^system_tray=.*/system_tray = disabled/' "$SUNSHINE_CONF"
+              else
+                echo "system_tray = disabled" >> "$SUNSHINE_CONF"
+              fi
+            fi
+            echo "Reboot to apply changes."
+            echo "Note that the ${yellow}Sunshine${n} service may not be enabled automatically. Run this entry through Bazzite Portal ${b}again${n} or run ${b}systemctl --user enable --now sunshine${n} to start it on next boot."
+            press_any_key
           fi
-        fi
-        brew services start sunshine-beta
-        override_service
-      fi
-    elif [[ "${OPTION,,}" =~ ^enable ]]; then
-      if [[ $(cat /etc/bazzite/image_name) =~ deck ]]; then
-        echo "Deck Images make use of Valve's gamescope microcompositor while in Game Mode."
-        echo "To stream on Game Mode, capture using ${b}Kernel Mode Setting${n} must be used, which is not supported by the Flatpak package."
-        echo "Read ${b}http://docs.bazzite.gg/Advanced/sunshine/#setting-up-sunshine-on-deck-images${n} to learn more."
-        if ! confirm "You may still stream on Desktop Mode by installing the flatpak. Continue?"; then
-          echo "Exiting..."
           exit 0
-        fi
-      fi
-      echo "Disabling any previous Flatpak ${yellow}Sunshine${n} service..."
-      systemctl --user disable --now app-dev.lizardbyte.app.Sunshine.service || true
-      if [[ "$(get_status_token)" == "enable-brew" ]]; then
-        if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
-          echo "Setting up Homebrew environment..."
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-        fi
-        brew tap LizardByte/homebrew
-        echo "Cleaning up any existing brew ${yellow}Sunshine${n} installs"
-        brew services stop sunshine-beta || true
-        brew unpin sunshine-beta || true
-        brew uninstall sunshine-beta || true
-        brew services stop sunshine || true
-        brew unpin sunshine || true
-        brew uninstall sunshine || true
-      fi
-      flatpak install --system -y dev.lizardbyte.app.Sunshine
-      flatpak run --command=additional-install.sh dev.lizardbyte.app.Sunshine
-      systemctl --user enable --now app-dev.lizardbyte.app.Sunshine
+          ;;
 
-    elif [[ "${OPTION,,}" =~ ^(update|upgrade) ]]; then
-      if [[ "$(get_status_token)" == "uninstall" ]]; then
-        echo "An upgrade was attempted but ${yellow}Sunshine${n} was not installed." >&2
-        exit 1
-      fi
-      if [[ "$(journalctl --no-hostname -b 0 -g 'Setting default sink to:')" != "-- No entries --" ]]; then
-        if ! confirm "Updating ${yellow}Sunshine${n} while streaming may leave you with a broken stream if you don't have physical access to the machine! Continue anyways?"; then
-          echo "Exiting..."
+        enable)
+          if deck_sunshine_installed; then
+            echo "You already have ${yellow}Sunshine${n} installed via layering. To avoid conflicts, ${b}remove${n} it first before installing the flatpak version."
+            press_any_key
+            exit 0
+          fi
+          if [[ $(cat /etc/bazzite/image_name) =~ deck ]]; then
+            echo "Deck Images make use of Valve's gamescope microcompositor while in Game Mode."
+            echo "To stream on Game Mode, capture using ${b}Kernel Mode Setting${n} must be used, which is not supported by the Flatpak package."
+            echo "Read ${b}https://docs.bazzite.gg/Advanced/sunshine/#limitations-of-the-flatpak-package${n} to learn more."
+            if ! confirm "You may still stream on Desktop Mode by installing the flatpak. Continue?"; then
+              echo "Exiting..."
+              exit 0
+            fi
+          fi
+          echo "Disabling any previous Flatpak ${yellow}Sunshine${n} service..."
+          systemctl --user disable --now app-dev.lizardbyte.app.Sunshine || true
+          if [[ "$(get_status_token)" == "enable-brew" ]]; then
+            yeet_brew
+          fi
+          flatpak install --system -y dev.lizardbyte.app.Sunshine
+          flatpak run --command=additional-install.sh dev.lizardbyte.app.Sunshine
+          systemctl --user enable --now app-dev.lizardbyte.app.Sunshine
           exit 0
-        fi
-      fi
-      if [[ "$(get_status_token)" == "enable-brew" ]]; then
-        if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
-          echo "Setting up Homebrew environment..."
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-        fi
-        brew services stop sunshine-beta || true
-        brew unpin sunshine-beta || true
-        brew upgrade sunshine-beta || true
-        brew pin sunshine-beta
-        sudo /usr/libexec/sunshine-postinst
-        brew services start sunshine-beta
-        override_service
-      elif [[ "$(get_status_token)" == "enable" ]]; then
-        flatpak update dev.lizardbyte.app.Sunshine
-      fi
-    elif [[ "${OPTION,,}" =~ ^disable ]]; then
-      if [[ "$(get_status_token)" == "enable-brew" ]]; then
-        if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
-          echo "Setting up Homebrew environment..."
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-        fi
-        brew services stop sunshine || true
-        brew services stop sunshine-beta || true
-      fi
-      systemctl --user disable --now app-dev.lizardbyte.app.Sunshine.service || true
-    elif [[ "${OPTION,,}" =~ ^uninstall ]]; then
-      if [[ "$(get_status_token)" == "enable-brew" ]]; then
-        if [ -x /home/linuxbrew/.linuxbrew/bin/brew ]; then
-          echo "Setting up Homebrew environment..."
-          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-        fi
-        brew services stop sunshine || true
-        brew services stop sunshine-beta || true
-        brew unpin sunshine || true
-        brew unpin sunshine-beta || true
-        brew uninstall sunshine || true
-        brew uninstall sunshine-beta || true
-      else
-        systemctl --user disable --now app-dev.lizardbyte.app.Sunshine.service || true
-        flatpak run --command=remove-additional-install.sh dev.lizardbyte.app.Sunshine || true
-        if confirm "Also delete ${yellow}Sunshine${n} configurations?"; then
-          flatpak uninstall --delete-data -y dev.lizardbyte.app.Sunshine || true
-        else
-          flatpak uninstall -y dev.lizardbyte.app.Sunshine || true
-        fi
-      fi
-      echo "${yellow}Sunshine${n} is now uninstalled."
-    elif [[ "${OPTION,,}" =~ ^(virtual-monitor|"configure virtual monitor") ]]; then
-      virtual-monitor
-    elif [[ "${OPTION,,}" =~ ^(portal|open) ]]; then
-      echo "Opening ${yellow}Sunshine${n} management portal..."
-      xdg-open https://localhost:47990
-    elif [[ "${OPTION,,}" =~ ^exit ]]; then
-      echo "Exiting without making changes."
-      exit 0
-    fi
+          ;;
+
+        disable|"disable service")
+          systemctl --user disable --now app-dev.lizardbyte.app.Sunshine || true
+          exit 0
+          ;;
+
+        uninstall)
+          systemctl --user disable --now app-dev.lizardbyte.app.Sunshine || true
+          if brew_sunshine_installed; then
+            yeet_brew
+          fi
+          if deck_sunshine_installed; then
+            rpm-ostree remove sunshine
+          fi
+          if sunshine_installed; then
+            flatpak run --command=remove-additional-install.sh dev.lizardbyte.app.Sunshine || true
+            if confirm "Also delete ${yellow}Sunshine${n} configurations?"; then
+              flatpak uninstall --delete-data -y dev.lizardbyte.app.Sunshine || true
+            else
+              flatpak uninstall -y dev.lizardbyte.app.Sunshine || true
+            fi
+          fi
+          echo "${yellow}Sunshine${n} is now uninstalled."
+          echo "Reboot to apply changes."
+          press_any_key
+          exit 0
+          ;;
+
+        virtual-monitor|"configure virtual monitor")
+          virtual-monitor
+          OPTION=""
+          ;;
+
+        portal|open|"open portal")
+          echo "Opening ${yellow}Sunshine${n} management portal..."
+          xdg-open https://localhost:47990
+          exit 0
+          ;;
+
+        exit)
+          echo "Exiting without making changes."
+          exit 0
+          ;;
+
+        *)
+          echo "Unknown option: $OPTION"
+          exit 1
+          ;;
+      esac
+    done
diff --git a/system_files/desktop/shared/usr/share/yafti/yafti.yml b/system_files/desktop/shared/usr/share/yafti/yafti.yml
index d2c274e846..ea814aee67 100644
--- a/system_files/desktop/shared/usr/share/yafti/yafti.yml
+++ b/system_files/desktop/shared/usr/share/yafti/yafti.yml
@@ -261,9 +261,9 @@ screens:
           - id: "enable"
             label: "Enable Sunshine"
             script: "ujust setup-sunshine enable"
-          - id: "enable-brew"
-            label: "Enable Sunshine Beta (installed using Brew)"
-            script: "ujust setup-sunshine enable-beta"
+          - id: "enable-deck"
+            label: "Enable Sunshine via Layering (for Deck users)"
+            script: "ujust setup-sunshine enable-deck"
           - id: "update"
             label: "Update Sunshine"
             script: "ujust setup-sunshine update"