diff --git a/autostart/20_dunst.sh b/autostart/20_dunst.sh
index 2f35e4b..b8caffb 100755
--- a/autostart/20_dunst.sh
+++ b/autostart/20_dunst.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-systemd-run --remain-after-exit --user --setenv=DISPLAY=${DISPLAY} dunst -config ~/.config/dunstrc &
+systemd-run --property=Restart=always --user --setenv=DISPLAY=${DISPLAY} dunst -config ~/.config/dunstrc &
diff --git a/autostart/20_screen.sh b/autostart/20_screen.sh
index ab3b815..e08d341 100755
--- a/autostart/20_screen.sh
+++ b/autostart/20_screen.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 printf '%s\n' "start compton"
-systemd-run --remain-after-exit --user --setenv=DISPLAY=${DISPLAY} compton --backend xrender --vsync opengl &
+systemd-run --property=Restart=always --user --setenv=DISPLAY=${DISPLAY} compton --backend xrender --vsync opengl &
 
 printf '%s\n' "disable screen blanking"
 xset -dpms &
diff --git a/autostart/40_wallpaper.sh b/autostart/40_wallpaper.sh
index e564273..9c79d40 100755
--- a/autostart/40_wallpaper.sh
+++ b/autostart/40_wallpaper.sh
@@ -3,4 +3,4 @@
 wallpaper="$LIBDIR/wallpaper/current"
 
 printf '%s' "setting wallpaper"
-systemd-run --remain-after-exit --user --setenv=DISPLAY=${DISPLAY} feh --bg-scale "${wallpaper}"
+systemd-run --property=Restart=always --user --setenv=DISPLAY=${DISPLAY} feh --bg-scale "${wallpaper}"
diff --git a/autostart/50_network.sh b/autostart/50_network.sh
index 0843221..f4a31d8 100755
--- a/autostart/50_network.sh
+++ b/autostart/50_network.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 printf '%s' "starting network tray application"
-systemd-run --remain-after-exit --user --setenv=DISPLAY=${DISPLAY} nm-applet
+systemd-run --property=Restart=always --user --setenv=DISPLAY=${DISPLAY} nm-applet
diff --git a/autostart/50_pasystray.sh b/autostart/50_pasystray.sh
index 4bbecac..897c5c4 100755
--- a/autostart/50_pasystray.sh
+++ b/autostart/50_pasystray.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 printf '%s' "starting pasystray"
-systemd-run --remain-after-exit --user --setenv=DISPLAY=${DISPLAY} pasystray
+systemd-run --property=Restart=always --user --setenv=DISPLAY=${DISPLAY} pasystray
diff --git a/autostart/50_redshift.sh b/autostart/50_redshift.sh
index 9774d23..f11090a 100755
--- a/autostart/50_redshift.sh
+++ b/autostart/50_redshift.sh
@@ -5,5 +5,5 @@ redshift_lat_long="49.5:11"
 redshift_colortemp="6000:3300"
 
 printf '%s' "starting redshift-gtk"
-systemd-run --remain-after-exit --user --setenv=DISPLAY=${DISPLAY} redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp"
+systemd-run --property=Restart=always --user --setenv=DISPLAY=${DISPLAY} redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp"
 printf '%s' $! > "$RUNDIR"/redshift.${XDG_SESSION_ID}.pid