diff --git a/Containerfile b/Containerfile
index 653bd09c..6691c037 100644
--- a/Containerfile
+++ b/Containerfile
@@ -444,7 +444,6 @@ RUN /tmp/image-info.sh && \
     systemctl disable rpm-ostreed-automatic.timer && \
     systemctl enable ublue-update.timer && \
     systemctl enable gamescope-workaround.service && \
-    systemctl enable sunshine-workaround.service && \
     systemctl enable waydroid-workaround.service && \
     systemctl enable bazzite-hardware-setup.service && \
     systemctl enable tailscaled.service && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just
index e1207c28..3fa932df 100644
--- a/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/deck/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -60,15 +60,22 @@ configure-waydroid:
 # Install Sunshine
 install-sunshine:
     #!/usr/bin/bash
-    flatpak install --system --noninteractive flathub dev.lizardbyte.app.Sunshine
-    flatpak run --command=additional-install.sh app/dev.lizardbyte.app.Sunshine/x86_64/stable || true
+    sudo sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree.repo
+    sudo sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo
+    systemctl enable sunshine-workaround.service
+    ublue-update --wait
+    rpm-ostree install -y sunshine
     echo "Sunshine is installed!"
 
 # Remove Sunshine
 remove-sunshine:
     #!/usr/bin/bash
-    flatpak run --command=remove-additional-install.sh app/dev.lizardbyte.app.Sunshine/x86_64/stable || true
-    flatpak uninstall --delete-data --noninteractive dev.lizardbyte.sunshine
+    sudo sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree.repo
+    sudo sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo
+    systemctl disable sunshine-workaround.service
+    ublue-update --wait
+    rpm-ostree remove -y sunshine
+    echo "Sunshine has been uninstalled."
 
 # Autostart Sunshine
 autostart-sunshine:
@@ -154,7 +161,7 @@ get-steamcmd:
 install-openrazer:
     sudo wget https://download.opensuse.org/repositories/hardware:/razer/Fedora_$(rpm -E %fedora)/hardware:razer.repo -O /etc/yum.repos.d/hardware:razer.repo && \
     ublue-update --wait && \
-    rpm-ostree install openrazer-meta razergenie && \
+    rpm-ostree install -y openrazer-meta razergenie && \
     if ! grep -q "plugdev" /etc/group; then \
       sudo bash -c 'grep "plugdev" /lib/group >> /etc/group' \
     ; fi && \
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
index 93e26bfc..97690c89 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -50,15 +50,22 @@ configure-waydroid:
 # Install Sunshine
 install-sunshine:
     #!/usr/bin/bash
-    flatpak install --system --noninteractive flathub dev.lizardbyte.app.Sunshine
-    flatpak run --command=additional-install.sh app/dev.lizardbyte.app.Sunshine/x86_64/stable || true
+    sudo sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree.repo
+    sudo sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo
+    systemctl enable sunshine-workaround.service
+    ublue-update --wait
+    rpm-ostree install -y sunshine
     echo "Sunshine is installed!"
 
 # Remove Sunshine
 remove-sunshine:
     #!/usr/bin/bash
-    flatpak run --command=remove-additional-install.sh app/dev.lizardbyte.app.Sunshine/x86_64/stable || true
-    flatpak uninstall --delete-data --noninteractive dev.lizardbyte.sunshine
+    sudo sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree.repo
+    sudo sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo
+    systemctl disable sunshine-workaround.service
+    ublue-update --wait
+    rpm-ostree remove -y sunshine
+    echo "Sunshine has been uninstalled."
 
 # Autostart Sunshine
 autostart-sunshine: