diff --git a/templates/i3/i3wm.service.j2 b/templates/i3/i3wm.service.j2
index 984e3b7..6a6e1e6 100644
--- a/templates/i3/i3wm.service.j2
+++ b/templates/i3/i3wm.service.j2
@@ -3,9 +3,9 @@ Description=i3 Window Manager
 PartOf=graphical-session.target
 
 [Service]
+Type=exec
 ExecStart=i3
 ExecStopPost=/bin/systemctl --user stop graphical-session.target
-Restart=on-failure
 
 [Install]
 RequiredBy=xsession.target
diff --git a/templates/vnc/vncserver.service.j2 b/templates/vnc/vncserver.service.j2
index deea768..f5e6723 100644
--- a/templates/vnc/vncserver.service.j2
+++ b/templates/vnc/vncserver.service.j2
@@ -20,7 +20,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/vncserver %i
+ExecStart=/usr/bin/vncserver -autokill %i
 ExecStop=/usr/bin/vncserver -kill %i
 
 [Install]