diff --git a/roles/beaker/virthost/tasks/main.yml b/roles/beaker/virthost/tasks/main.yml
index ef1c6471d0..d8684ed1eb 100644
--- a/roles/beaker/virthost/tasks/main.yml
+++ b/roles/beaker/virthost/tasks/main.yml
@@ -21,5 +21,4 @@
   template:
     src: client-libvirt.xml.j2
     dest: /root/{{ item }}.libvirt.xml
-    vmdata: "{{ item }}"
   with_items: clients
diff --git a/roles/beaker/virthost/templates/client-libvirt.xml.j2 b/roles/beaker/virthost/templates/client-libvirt.xml.j2
index b4939a7521..5ae26b4686 100644
--- a/roles/beaker/virthost/templates/client-libvirt.xml.j2
+++ b/roles/beaker/virthost/templates/client-libvirt.xml.j2
@@ -1,5 +1,5 @@
 <domain type='kvm'>
-  <name>{{ vmdata.hostname }}</name>
+  <name>{{ item.hostname }}</name>
   <memory unit='KiB'>{{ mem_size_kb }}</memory>
   <vcpu placement='static'>{{ num_cpus }}</vcpu>
   <os>
@@ -30,7 +30,7 @@
     <emulator>/usr/bin/qemu-kvm</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw' cache='none' io='native'/>
-      <source dev='/dev/{{ volgroup }}/{{ vmdata.hostname }}'/>
+      <source dev='/dev/{{ volgroup }}/{{ item.hostname }}'/>
       <target dev='vda' bus='virtio'/>
       <boot order='2'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
@@ -55,7 +55,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </controller>
     <interface type='bridge'>
-      <mac address='{{ vmdata.macaddress }}'/>
+      <mac address='{{ item.macaddress }}'/>
       <source bridge='{{ bridge_name }}'/>
       <model type='virtio'/>
       <boot order='1'/>