diff --git a/foot-server@.service.in b/foot-server@.service.in
index 81c13bb4..a9b954c4 100644
--- a/foot-server@.service.in
+++ b/foot-server@.service.in
@@ -1,13 +1,17 @@
-[Service]
-ExecStart=@bindir@/foot --server=0
-Environment=WAYLAND_DISPLAY=%i
-NonBlocking=true
-StandardInput=socket
-
 [Unit]
-Requires=%N.socket
 Description=Foot terminal server mode for WAYLAND_DISPLAY=%i
 Documentation=man:foot(1)
+PartOf=graphical-session.target
+After=graphical-session.target
+ConditionEnvironment=WAYLAND_DISPLAY
+
+[Service]
+ExecStart=@bindir@/foot --server=0
+Environment="WAYLAND_DISPLAY=%i"
+NonBlocking=true
+StandardInput=socket
+Restart=on-failure
 
 [Install]
-WantedBy=wayland-instance@.target
+Also=%N.socket
+WantedBy=graphical-session.target
diff --git a/foot-server@.socket b/foot-server@.socket
index 71db51cb..2a3cfa37 100644
--- a/foot-server@.socket
+++ b/foot-server@.socket
@@ -1,5 +1,8 @@
+[Unit]
+Description=Foot server socket
+
 [Socket]
 ListenStream=%t/foot-%i.sock
 
 [Install]
-WantedBy=wayland-instance@.target
+WantedBy=sockets.target