diff --git a/Makefile b/Makefile
index ae9ed5eff97ff006fe2f0f0f88f936fdce584049..a6c3ca6ba54ce047183093c34c8c8f15ec92e004 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ test: $(TARGETS)
 	python3 ./hostinfo-libvirt --vm-check
 
 hostinfo-libvirt: src/hostinfo-libvirt.py $(sort $(wildcard src/*.py)) Makefile
-	(cd src ; apa -o ../$@ $(filter %.py,  $(^:src/%=%)))
+	(cd src ; apa --filter-imports  -o ../$@ $(filter %.py,  $(^:src/%=%)))
 
 
 .PHONY:
diff --git a/src/vm.py b/src/vm.py
index 366e163f3afa4243625a09642e9cd24dee98caa0..f0621d5063a0f9f69095fb6c5ccef2981036c22c 100644
--- a/src/vm.py
+++ b/src/vm.py
@@ -10,6 +10,13 @@ DOMAIN_TEMPLATE = """
 <domain type='kvm'>
   <name>%(name)s</name>
   <uuid>%(uuid)s</uuid>
+  <metadata>
+    <control.lth.se:hostinfo xmlns:control.lth.se="http://control.lth.se/hostinfo/">
+      %(metadata)s
+    </control.lth.se:hostinfo>
+    <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar>
+  </metadata>
+
   <memory unit='bytes'>%(memory)s</memory>
   <currentMemory unit='bytes'>%(memory)s</currentMemory>
   <vcpu>%(cpus)s</vcpu>
@@ -368,6 +375,7 @@ def domain_xml(virtual_machine):
         name=virtual_machine.name,
         memory=util.eval_size(virtual_machine.memory or '1G'),
         uuid=virtual_machine.uuid,
+        metadata=virtual_machine.qemu._parent._xml(),
         cpus=virtual_machine.cpus or '1',
         arch=virtual_machine.arch or 'x86_64',
         cpu_model=cpu_model or '',