diff --git a/bootstrapvz/plugins/vagrant/assets/box.ovf b/bootstrapvz/plugins/vagrant/assets/box.ovf
index b990dfd..9f8d7f7 100644
--- a/bootstrapvz/plugins/vagrant/assets/box.ovf
+++ b/bootstrapvz/plugins/vagrant/assets/box.ovf
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Envelope ovf:version="1.0" xml:lang="en-US" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
   <References>
-    <File ovf:href="[disk_name]" ovf:id="file1"/>
+    <File ovf:href="[DISK_NAME]" ovf:id="file1"/>
   </References>
   <DiskSection>
     <Info>List of the virtual disks used in the package</Info>
diff --git a/bootstrapvz/plugins/vagrant/tasks.py b/bootstrapvz/plugins/vagrant/tasks.py
index ead8569..90ad443 100644
--- a/bootstrapvz/plugins/vagrant/tasks.py
+++ b/bootstrapvz/plugins/vagrant/tasks.py
@@ -184,7 +184,7 @@ class PackageBox(Task):
 		[disk] = root.findall('./ovf:DiskSection/ovf:Disk', namespaces)
 		attr(disk, 'ovf:capacity', info.volume.size.bytes.get_qty_in('B'))
 		attr(disk, 'ovf:format', info.volume.ovf_uri)
-		attr(disk, 'ovf:uuid', volume_uuid)
+		attr(disk, 'vbox:uuid', volume_uuid)
 
 		[system] = root.findall('./ovf:VirtualSystem', namespaces)
 		attr(system, 'ovf:id', info._vagrant['box_name'])
@@ -205,7 +205,7 @@ class PackageBox(Task):
 		[device_img] = machine.findall('./ovf:StorageControllers'
 		                               '/ovf:StorageController[@name="SATA Controller"]'
 		                               '/ovf:AttachedDevice/ovf:Image', namespaces)
-		attr(device_img, 'ovf:uuid', '{' + str(volume_uuid) + '}')
+		attr(device_img, 'uuid', '{' + str(volume_uuid) + '}')
 
 		template.write(destination, xml_declaration=True)  # , default_namespace=namespaces['ovf']