diff --git a/units/systemd-vmspawn@.service.in b/units/systemd-vmspawn@.service.in
index 608002040c..fc4522ddb8 100644
--- a/units/systemd-vmspawn@.service.in
+++ b/units/systemd-vmspawn@.service.in
@@ -16,7 +16,7 @@ After=network.target modprobe@tun.service
 RequiresMountsFor=/var/lib/machines/%i
 
 [Service]
-ExecStart=systemd-vmspawn --quiet --network-tap --machine=%i
+ExecStart=systemd-vmspawn --quiet --register=yes --keep-unit --network-tap --machine=%i
 KillMode=mixed
 Type=notify
 Slice=machine.slice