diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml
index 03cae97fff..854b3afdd7 100644
--- a/playbooks/vhost_update.yml
+++ b/playbooks/vhost_update.yml
@@ -1,43 +1,43 @@
+# This playboook updates a virthost and all it's guests. 
+#
 # requires --extra-vars="target=somevhostname yumcommand=update"
+#
 
 - name: find instances
-  hosts: $target
+  hosts: "{{ target }}"
   accelerate: true
+  gather_facts: False
   user: root
 
   tasks:
   - name: get list of guests
-    action: virt command=list_vms
+    virt: command=list_vms
     register: vmlist
 
   - name: add them to myvms_new group
-    local_action: add_host hostname=$item groupname=myvms_new
-    with_items: ${vmlist.list_vms}
+    local_action: add_host hostname={{ item }} groupname=myvms_new
+    with_items: vmlist.list_vms
 
 - name: update all run rkhunter if installed
-  hosts: $target;myvms_new
+  hosts: "{{ target }}:myvms_new"
   accelerate: true
+  gather_facts: False
   user: root
 
   tasks:
   - name: expire-caches
-    action: command yum clean expire-cache
+    command: yum clean expire-cache
     
-  - name: yum -y ${yumcommand}
-    action: command yum -y ${yumcommand}
+  - name: yum -y {{ yumcommand }}
+    command: yum -y {{ yumcommand }}
     async: 7200
-    poll: 50
+    poll: 30
 
   - name: check for rkhunter
-    action: command /usr/bin/test -f /usr/bin/rkhunter
+    command: /usr/bin/test -f /usr/bin/rkhunter
     register: rkhunter
     ignore_errors: true
   
   - name: run rkhunter --propupd
-    action: command /usr/bin/rkhunter --propupd
+    command: /usr/bin/rkhunter --propupd
     when: rkhunter|success
-
-
-
-
-