diff --git a/src/arch-nspawn.in b/src/arch-nspawn.in
index 53b77df..1eba0a6 100644
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -60,7 +60,8 @@ nspawn_args=(
 	--directory="$working_dir"
 	--setenv="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin"
 	--register=no
-	--keep-unit
+	--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
+	--machine="arch-nspawn-$$"
 	--as-pid2
 )