diff --git a/roles/beaker/virthost/tasks/main.yml b/roles/beaker/virthost/tasks/main.yml
index ed89a80a85..de675b1d63 100644
--- a/roles/beaker/virthost/tasks/main.yml
+++ b/roles/beaker/virthost/tasks/main.yml
@@ -21,8 +21,6 @@
   template:
     src: client-libvirt.xml.j2
     dest: /root/{{ item }}.libvirt.xml
-    vmhostname: "{{ clients[item]['hostname'] }}"
-    vmmacaddress: "{{ clients[item]['macaddress'] }}"
-  with_items:
-    - "virt02"
-    - "virt03"
+    vmhostname: "{{ item['hostname'] }}"
+    vmmacaddress: "{{ item['macaddress'] }}"
+  with_items: clients