This was blocked on environment variables issues which are now resolved
By marking as part of graphical-session we get a more graceful shutdown. Also switched to explicit restart inside the unit. Originally I did this with drop-ins, but this complicates wayland for now.