diff --git a/systemd.service b/systemd.service
index e183f92..b316fb7 100644
--- a/systemd.service
+++ b/systemd.service
@@ -1,9 +1,15 @@
 [Unit]
 Description=Create %i images for LXD
-Wants=network-online.target lxd.service
+Requires=network-online.target lxd.service
 After=network-online.target lxd.service
 
 [Service]
+Type=oneshot
 ExecStart=/usr/bin/distrobuilder-create %i
 User=distrobuilder-create
 Group=distrobuilder-create
+Restart=on-failure
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target