diff --git a/Containerfile b/Containerfile
index d87acba182..000ee650ff 100644
--- a/Containerfile
+++ b/Containerfile
@@ -93,6 +93,7 @@ RUN --mount=type=cache,dst=/var/cache \
         ublue-os/packages \
         ublue-os/obs-vkcapture \
         ycollet/audinux \
+        pvermeer/sunshine \
         che/nerd-fonts; \
     do \
         echo "Enabling copr: $copr"; \
@@ -233,6 +234,7 @@ RUN --mount=type=cache,dst=/var/cache \
         lato-fonts \
         fira-code-fonts \
         nerd-fonts \
+        sunshine \
         python3-pip \
         libadwaita \
         bees \
@@ -493,6 +495,7 @@ RUN --mount=type=cache,dst=/var/cache \
     echo "import \"/usr/share/ublue-os/just/81-bazzite-fixes.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-apps.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-beesd.just\"" >> /usr/share/ublue-os/justfile && \
+    echo "import \"/usr/share/ublue-os/just/82-bazzite-sunshine.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/82-bazzite-waydroid.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/83-bazzite-audio.just\"" >> /usr/share/ublue-os/justfile && \
     echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \
@@ -540,6 +543,7 @@ RUN --mount=type=cache,dst=/var/cache \
         ublue-os/packages \
         ublue-os/obs-vkcapture \
         ycollet/audinux \
+        pvermeer/sunshine \
         che/nerd-fonts; \
     do \
         dnf5 -y copr disable $copr; \
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
new file mode 100644
index 0000000000..3293ba3cff
--- /dev/null
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-sunshine.just
@@ -0,0 +1,37 @@
+# vim: set ft=make :
+
+# Setup and configure Sunshine Game Streaming host
+[group("gaming")]
+setup-sunshine ACTION="":
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
+    SERVICE_STATE="$(systemctl is-enabled --user sunshine.service)"
+    OPTION={{ ACTION }}
+    if [ "$SERVICE_STATE" == "enabled" ]; then
+        SERVICE_STATE="${green}${b}Enabled${n}"
+    else
+        SERVICE_STATE="${red}${b}Disabled${n}"
+    fi
+    if [ "$OPTION" == "help" ]; then
+      echo "Usage: ujust setup-sunshine <option>"
+      echo "  <option>: Specify the quick option to skip the prompt"
+      echo "  Use 'enable' to enable the Sunshine service"
+      echo "  Use 'disable' to disable the Sunshine service"
+      echo "  Use 'portal' to open the Sunshine management portal"
+      echo "  Use 'exit' to exit without making changes"
+      exit 0
+    elif [ "$OPTION" == "" ]; then
+      echo "Service is $SERVICE_STATE"
+      OPTION=$(Choose "Enable" "Disable" "Open Portal" "Exit")
+    fi
+    if [[ "${OPTION,,}" =~ ^enable ]]; then
+      systemctl enable --user --now sunshine.service
+    elif [[ "${OPTION,,}" =~ ^(remove|uninstall|disable) ]]; then
+      systemctl disable --user --now sunshine.service 
+    elif [[ "${OPTION,,}" =~ ^(portal|open) ]]; then
+      echo "Opening Sunshine management portal..."
+      xdg-open https://localhost:47990
+    elif [[ "${OPTION,,}" =~ ^exit ]]; then
+      echo "Exiting without making changes."
+      exit 0
+    fi
diff --git a/system_files/desktop/silverblue/etc/systemd/user/sunshine-kms.service.d/override.conf b/system_files/desktop/silverblue/etc/systemd/user/sunshine-kms.service.d/override.conf
new file mode 100644
index 0000000000..75ecfda97f
--- /dev/null
+++ b/system_files/desktop/silverblue/etc/systemd/user/sunshine-kms.service.d/override.conf
@@ -0,0 +1,2 @@
+[Install]
+WantedBy=gnome-session.target
diff --git a/system_files/desktop/silverblue/etc/systemd/user/sunshine.service.d/override.conf b/system_files/desktop/silverblue/etc/systemd/user/sunshine.service.d/override.conf
new file mode 100644
index 0000000000..75ecfda97f
--- /dev/null
+++ b/system_files/desktop/silverblue/etc/systemd/user/sunshine.service.d/override.conf
@@ -0,0 +1,2 @@
+[Install]
+WantedBy=gnome-session.target