diff --git a/.config/sway/conf.d/autoruns b/.config/sway/conf.d/autoruns
index aa78753..611a474 100644
--- a/.config/sway/conf.d/autoruns
+++ b/.config/sway/conf.d/autoruns
@@ -7,9 +7,11 @@
 exec_always /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 
 # Make sure the systemd user session gets all envs
-exec_always "systemctl --user import-environment"
+exec_always "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK"
+exec_always "dbus-update-activation-environment --all --systemd"
 
-exec eval $(gnome-keyring-daemon --start)
+# Not needed if started via Systemd
+#exec eval $(gnome-keyring-daemon --start)
 
 # Autostart applets
 exec nm-applet --indicator