diff --git a/pillar/role/hypervisor/standalone.sls b/pillar/role/hypervisor/standalone.sls
index f378537..238bde7 100644
--- a/pillar/role/hypervisor/standalone.sls
+++ b/pillar/role/hypervisor/standalone.sls
@@ -3,3 +3,10 @@ include:
 
 infrastructure:
   image_type: qcow2
+
+libvirt:
+  guests:
+    on_boot: start
+    on_shutdown: shutdown
+    parallel_shutdown: 4
+    start_delay: 2
diff --git a/salt/role/hypervisor/standalone.sls b/salt/role/hypervisor/standalone.sls
index a572acc..0f9439a 100644
--- a/salt/role/hypervisor/standalone.sls
+++ b/salt/role/hypervisor/standalone.sls
@@ -1,6 +1,3 @@
 include:
   - .common
-
-libvirt-guests:
-  service.running:
-    - enable: true
+  - libvirt.guests