diff --git a/system_files/desktop/shared/usr/lib/systemd/system/sunshine-workaround.service b/system_files/desktop/shared/usr/lib/systemd/system/sunshine-workaround.service
deleted file mode 100644
index 2bafbd82a81..00000000000
--- a/system_files/desktop/shared/usr/lib/systemd/system/sunshine-workaround.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Workaround sunshine not having the correct caps
-ConditionFileIsExecutable=/usr/bin/sunshine
-After=local-fs.target
-
-[Service]
-Type=oneshot
-# Copy if it doesn't exist
-ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/bin/.sunshine ] || /usr/bin/cp /usr/bin/sunshine /usr/local/bin/.sunshine"
-# This is faster than using .mount unit. Also allows for the previous line/cleanup
-ExecStartPre=/usr/bin/bash -c "/usr/bin/mount --bind /usr/local/bin/.sunshine /usr/bin/sunshine"
-# Fix caps
-ExecStart=/usr/bin/bash -c "/usr/sbin/setcap 'cap_sys_admin+p' $(/usr/bin/readlink -f $(/usr/bin/which sunshine))"
-# Clean-up after ourselves
-ExecStop=/usr/bin/umount /usr/bin/sunshine
-ExecStop=/usr/bin/rm /usr/local/bin/.sunshine
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
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 dc3812d6777..3834c892cf8 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
@@ -22,9 +22,7 @@ setup-sunshine ACTION="":
       OPTION=$(Choose "Enable" "Disable")
     fi
     if [[ "${OPTION,,}" =~ ^enable ]]; then
-      systemctl enable sunshine-workaround.service
       systemctl enable --user --now sunshine.service
     elif [[ "${OPTION,,}" =~ ^(remove|uninstall|disable) ]]; then
-      systemctl disable sunshine-workaround.service
       systemctl disable --user --now sunshine.service 
     fi
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just b/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just
index 643082fe868..8a4f3228e49 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/84-bazzite-virt.just
@@ -76,8 +76,6 @@ setup-virtualization ACTION="":
       CPU_VENDOR=$(grep "vendor_id" "/proc/cpuinfo" | uniq | awk -F": " '{ print $2 }')
       VENDOR_KARG="unset"
       if [[ ${VIRT_TEST} == *kvm.report_ignored_msrs* ]]; then
-        echo 'add_drivers+=" vfio vfio_iommu_type1 vfio-pci "' | sudo tee /etc/dracut.conf.d/vfio.conf
-        rpm-ostree initramfs --enable
         if [[ ${CPU_VENDOR} == "AuthenticAMD" ]]; then
           VENDOR_KARG="amd_iommu=on"
         elif [[ ${CPU_VENDOR} == "GenuineIntel" ]]; then