diff --git a/salt/control/virt.sls b/salt/control/virt.sls
index 35987a2..b5eab40 100644
--- a/salt/control/virt.sls
+++ b/salt/control/virt.sls
@@ -61,7 +61,7 @@
       seed: True
       serial_type: pty
       console: True
-  - unless: virsh list --all | grep {{ node_name }}.{{ cluster.domain }}
+  - unless: virsh list --all --name| grep -E "^{{ node_name }}.{{ cluster.domain }}$"
 
 #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 #  module.run:
@@ -77,7 +77,7 @@
   - name: virt.set_autostart
   - vm_: {{ node_name }}.{{ cluster.domain }}
   - state: true
-  - unless: virsh list --autostart | grep {{ node_name }}.{{ cluster.domain }}
+  - unless: virsh list --autostart --name| grep -E "^{{ node_name }}.{{ cluster.domain }}$"
   
 {%- endif %}