diff --git a/README.md b/README.md
index 62f71ac..d83fe25 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@ By default, access to the EC2 instance is restriced. To update ane set the white
 
 ## Manual steps on first boot
 
+### Install NVIDIA driver
+
 Login to EC2 instance:
 
     ssh ubuntu@<IP>
@@ -61,7 +63,9 @@ Install NVIDIA gaming driver and reboot:
 
     sudo reboot
 
-Setup [Sunshine] and configure username and password for sunshine API user:
+### Setup Sunshine
+
+Configure username and password for sunshine API user:
 
     https --verify=no :47990/api/password newUsername="sunshine" newPassword="sunshine" confirmNewPassword="sunshine"
 
@@ -81,7 +85,7 @@ Launch Steam, Login for the first time and:
 
   * Move the Steam Library to `/mnt/sunshine/SteamLibrary` (Setting/Downloads/Steam Library Folder)
   * Enable Steam Play (Proton) for supported and all other titles (Setting/Steam Play)
-  * Run Backup (via appliction icon or `/usr/local/bin/backup` before next shutdown/reboot)
+  * Run Backup (via application icon or `/usr/local/bin/backup` before next shutdown/reboot)
 
 ## Optional steps
 
diff --git a/cloud-init/cloud-config.yaml b/cloud-init/cloud-config.yaml
index a236295..d658c12 100644
--- a/cloud-init/cloud-config.yaml
+++ b/cloud-init/cloud-config.yaml
@@ -96,6 +96,18 @@ write_files:
 - path: /etc/udev/rules.d/85-sunshine-input.rules
   content: |
     KERNEL=="uinput", GROUP="input", MODE="0660", OPTIONS+="static_node=uinput"
+- path: /opt/sunshine_systemd_user_service.patch
+  content: |
+    5,7c5
+    < PartOf=graphical-session.target
+    < Wants=xdg-desktop-autostart.target
+    < After=xdg-desktop-autostart.target
+    ---
+    > After=graphical-session.target
+    15c13
+    < WantedBy=xdg-desktop-autostart.target
+    ---
+    > WantedBy=graphical-session.target
 - path: /opt/install_nvidia_driver.sh
   content: |
     #!/bin/bash
@@ -195,8 +207,10 @@ runcmd:
   - rm -f /etc/apt/sources.list.d/steam.list
   - apt update
   - apt install -y libgl1-mesa-dri:i386 steam-libs-i386:i386 libgl1-mesa-dri:amd64 libgl1-mesa-glx:i386 libgl1-mesa-glx:amd64 libvulkan1:i386 libgnutls30:i386
-  - wget https://github.com/LizardByte/Sunshine/releases/download/v0.18.4/sunshine-ubuntu-22.04-amd64.deb
+  - wget https://github.com/LizardByte/Sunshine/releases/download/v0.23.1/sunshine-ubuntu-22.04-amd64.deb
   - apt install -y ./sunshine-ubuntu-22.04-amd64.deb
+  - rm -f ./sunshine-ubuntu-22.04-amd64.deb
+  - patch /usr/lib/systemd/user/sunshine.service < /opt/sunshine_systemd_user_service.patch
   - su -c "systemctl --user enable sunshine" sunshine
   - su -c "systemctl --user enable init_desktop_settings" sunshine
   - su -c "desktop-file-install --dir=/home/sunshine/.config/autostart /usr/local/share/applications/restore.desktop" sunshine