diff --git a/repos/ports/run/vbox4_ubuntu_14_04_32.run b/repos/ports/run/vbox4_ubuntu_14_04_32.run
new file mode 100644
index 000000000..4d9835dfb
--- /dev/null
+++ b/repos/ports/run/vbox4_ubuntu_14_04_32.run
@@ -0,0 +1,22 @@
+#
+# Ubuntu 14.04 32bit in VBox 4
+#
+
+set flavor   "ubuntu_14_04_32"
+
+set use_vbox4 1
+set use_vbox5 0
+
+set use_rumpfs 1
+# Write overlay only into ram
+set use_ram_fs 1
+# However read initial overlay from disk
+set use_overlay_from_disk 1
+
+set use_usb 1
+set use_ps2 [have_spec ps2]
+
+set use_vms 1
+set use_cpu_load 1
+
+source ${genode_dir}/repos/ports/run/vbox_win.inc
diff --git a/repos/ports/run/vbox4_ubuntu_64.run b/repos/ports/run/vbox4_ubuntu_14_04_64.run
similarity index 83%
rename from repos/ports/run/vbox4_ubuntu_64.run
rename to repos/ports/run/vbox4_ubuntu_14_04_64.run
index 53665cc1a..7bd5edf7a 100644
--- a/repos/ports/run/vbox4_ubuntu_64.run
+++ b/repos/ports/run/vbox4_ubuntu_14_04_64.run
@@ -1,10 +1,10 @@
 #
-# Ubuntu 64bit in VirtualBox
+# Ubuntu 14.04 64bit in VBox 4
 #
 
 assert_spec 64bit
 
-set flavor   "ubuntu_64"
+set flavor   "ubuntu_14_04_64"
 
 set use_vbox4 1
 set use_vbox5 0
diff --git a/repos/ports/run/vbox4_ubuntu_16_04_32.run b/repos/ports/run/vbox4_ubuntu_16_04_32.run
new file mode 100644
index 000000000..6595dadb7
--- /dev/null
+++ b/repos/ports/run/vbox4_ubuntu_16_04_32.run
@@ -0,0 +1,22 @@
+#
+# Ubuntu 16.04 32bit in VBox 4
+#
+
+set flavor   "ubuntu_16_04_32"
+
+set use_vbox4 1
+set use_vbox5 0
+
+set use_rumpfs 1
+# Write overlay only into ram
+set use_ram_fs 1
+# However read initial overlay from disk
+set use_overlay_from_disk 1
+
+set use_usb 1
+set use_ps2 [have_spec ps2]
+
+set use_vms 1
+set use_cpu_load 1
+
+source ${genode_dir}/repos/ports/run/vbox_win.inc
diff --git a/repos/ports/run/vbox4_ubuntu_16_04_64.run b/repos/ports/run/vbox4_ubuntu_16_04_64.run
new file mode 100644
index 000000000..4081b2e10
--- /dev/null
+++ b/repos/ports/run/vbox4_ubuntu_16_04_64.run
@@ -0,0 +1,24 @@
+#
+# Ubuntu 16.04 64bit in VBox 4
+#
+
+assert_spec 64bit
+
+set flavor   "ubuntu_16_04_64"
+
+set use_vbox4 1
+set use_vbox5 0
+
+set use_rumpfs 1
+# Write overlay only into ram
+set use_ram_fs 1
+# However read initial overlay from disk
+set use_overlay_from_disk 1
+
+set use_usb 1
+set use_ps2 [have_spec ps2]
+
+set use_vms 1
+set use_cpu_load 1
+
+source ${genode_dir}/repos/ports/run/vbox_win.inc
diff --git a/repos/ports/run/vbox5_ubuntu_14_04_32.run b/repos/ports/run/vbox5_ubuntu_14_04_32.run
new file mode 100644
index 000000000..c9700f7f5
--- /dev/null
+++ b/repos/ports/run/vbox5_ubuntu_14_04_32.run
@@ -0,0 +1,22 @@
+#
+# Ubuntu 14.04 32bit in VBox 5
+#
+
+set flavor   "ubuntu_14_04_32"
+
+set use_vbox4 0
+set use_vbox5 1
+
+set use_rumpfs 1
+# Write overlay only into ram
+set use_ram_fs 1
+# However read initial overlay from disk
+set use_overlay_from_disk 1
+
+set use_usb 1
+set use_ps2 [have_spec ps2]
+
+set use_vms 1
+set use_cpu_load 1
+
+source ${genode_dir}/repos/ports/run/vbox_win.inc
diff --git a/repos/ports/run/vbox5_ubuntu_64.run b/repos/ports/run/vbox5_ubuntu_14_04_64.run
similarity index 83%
rename from repos/ports/run/vbox5_ubuntu_64.run
rename to repos/ports/run/vbox5_ubuntu_14_04_64.run
index 5b29a24ee..03419ea16 100644
--- a/repos/ports/run/vbox5_ubuntu_64.run
+++ b/repos/ports/run/vbox5_ubuntu_14_04_64.run
@@ -1,10 +1,10 @@
 #
-# Ubuntu 64bit in VirtualBox
+# Ubuntu 14.04 64bit in VBox 5
 #
 
 assert_spec 64bit
 
-set flavor   "ubuntu_64"
+set flavor   "ubuntu_14_04_64"
 
 set use_vbox4 0
 set use_vbox5 1
diff --git a/repos/ports/run/vbox5_ubuntu_16_04_32.run b/repos/ports/run/vbox5_ubuntu_16_04_32.run
new file mode 100644
index 000000000..81807c4fc
--- /dev/null
+++ b/repos/ports/run/vbox5_ubuntu_16_04_32.run
@@ -0,0 +1,22 @@
+#
+# Ubuntu 16.04 32bit in VBox 5
+#
+
+set flavor   "ubuntu_16_04_32"
+
+set use_vbox4 0
+set use_vbox5 1
+
+set use_rumpfs 1
+# Write overlay only into ram
+set use_ram_fs 1
+# However read initial overlay from disk
+set use_overlay_from_disk 1
+
+set use_usb 1
+set use_ps2 [have_spec ps2]
+
+set use_vms 1
+set use_cpu_load 1
+
+source ${genode_dir}/repos/ports/run/vbox_win.inc
diff --git a/repos/ports/run/vbox5_ubuntu_16_04_64.run b/repos/ports/run/vbox5_ubuntu_16_04_64.run
new file mode 100644
index 000000000..95893abc7
--- /dev/null
+++ b/repos/ports/run/vbox5_ubuntu_16_04_64.run
@@ -0,0 +1,24 @@
+#
+# Ubuntu 16.04 64bit in VBox 5
+#
+
+assert_spec 64bit
+
+set flavor   "ubuntu_16_04_64"
+
+set use_vbox4 0
+set use_vbox5 1
+
+set use_rumpfs 1
+# Write overlay only into ram
+set use_ram_fs 1
+# However read initial overlay from disk
+set use_overlay_from_disk 1
+
+set use_usb 1
+set use_ps2 [have_spec ps2]
+
+set use_vms 1
+set use_cpu_load 1
+
+source ${genode_dir}/repos/ports/run/vbox_win.inc
diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc
index 7ca5b0154..2e867668f 100644
--- a/repos/ports/run/vbox_win.inc
+++ b/repos/ports/run/vbox_win.inc
@@ -328,7 +328,11 @@ run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamle
 if {$use_rumpfs} {
 	set wait_timeout 170
 	for { set i 1 } { $i <= $use_vms } { incr i } {
-		run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} $wait_timeout [output_spawn_id]
+		if { [string match "ubuntu*" $flavor] } {
+			run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: no} $wait_timeout [output_spawn_id]
+		} else {
+			run_genode_until {\[init -\> vbox.*].*Guest Additions capability report:.*seamless: yes, hostWindowMapping: no, graphics: yes} $wait_timeout [output_spawn_id]
+		}
 	}
 } else {
 	run_genode_until {\[init\] child "vbox1" exited with exit value 0} 60 [output_spawn_id]
diff --git a/repos/ports/run/vm_ubuntu_14_04_32.vbox b/repos/ports/run/vm_ubuntu_14_04_32.vbox
new file mode 100644
index 000000000..9b181f220
--- /dev/null
+++ b/repos/ports/run/vm_ubuntu_14_04_32.vbox
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+** DO NOT EDIT THIS FILE.
+** If you make changes to this file while any VirtualBox related application
+** is running, your changes will be overwritten later, without taking effect.
+** Use VBoxManage or the VirtualBox Manager GUI to make changes.
+-->
+<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.14-linux">
+  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_14_04_32" OSType="Ubuntu" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
+    <MediaRegistry>
+      <HardDisks>
+        <HardDisk uuid="{e42dc362-b42c-4459-bc79-7b5235b9a44d}" location="/ubuntu_14_04_32.vdi" format="VDI" type="Immutable">
+          <HardDisk uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}" location="/ram/overlay_ubuntu_14_04_32.vdi" format="VDI" autoReset="true"/>
+        </HardDisk>
+      </HardDisks>
+      <DVDImages/>
+      <FloppyImages/>
+    </MediaRegistry>
+    <ExtraData/>
+    <Hardware version="2">
+      <CPU count="2" hotplug="false">
+        <HardwareVirtEx enabled="true"/>
+        <HardwareVirtExNestedPaging enabled="true"/>
+        <HardwareVirtExVPID enabled="true"/>
+        <HardwareVirtExUX enabled="false"/>
+        <PAE enabled="true"/>
+        <LongMode enabled="false"/>
+        <HardwareVirtExLargePages enabled="false"/>
+        <HardwareVirtForce enabled="false"/>
+      </CPU>
+      <Memory RAMSize="1024" PageFusion="false"/>
+      <HID Pointing="USBTablet" Keyboard="PS2Keyboard"/>
+      <HPET enabled="false"/>
+      <Chipset type="PIIX3"/>
+      <Boot>
+        <Order position="1" device="Floppy"/>
+        <Order position="2" device="DVD"/>
+        <Order position="3" device="HardDisk"/>
+        <Order position="4" device="None"/>
+      </Boot>
+      <Display VRAMSize="20" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/>
+      <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/>
+      <RemoteDisplay enabled="false" authType="Null"/>
+      <BIOS>
+        <ACPI enabled="true"/>
+        <IOAPIC enabled="true"/>
+        <Logo fadeIn="true" fadeOut="true" displayTime="0"/>
+        <BootMenu mode="MessageAndMenu"/>
+        <TimeOffset value="0"/>
+        <PXEDebug enabled="false"/>
+      </BIOS>
+      <USB>
+        <Controllers>
+          <Controller name="OHCI" type="OHCI"/>
+        </Controllers>
+        <DeviceFilters/>
+      </USB>
+      <Network>
+        <Adapter slot="0" enabled="false" MACAddress="0800271D7901" cable="true" speed="0" type="82540EM">
+          <HostInterface/>
+          <DisabledModes/>
+        </Adapter>
+      </Network>
+      <UART>
+        <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
+        <Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
+      </UART>
+      <LPT>
+        <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
+        <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
+      </LPT>
+      <AudioAdapter controller="HDA" driver="Pulse" enabled="false"/>
+      <RTC localOrUTC="UTC"/>
+      <SharedFolders/>
+      <Clipboard mode="Disabled"/>
+      <DragAndDrop mode="Disabled"/>
+      <IO>
+        <IoCache enabled="true" size="5"/>
+        <BandwidthGroups/>
+      </IO>
+      <HostPci>
+        <Devices/>
+      </HostPci>
+      <EmulatedUSB>
+        <CardReader enabled="false"/>
+      </EmulatedUSB>
+      <Guest memoryBalloonSize="0"/>
+      <GuestProperties/>
+    </Hardware>
+    <StorageControllers>
+      <StorageController name="SATA" type="AHCI" PortCount="2" useHostIOCache="true" Bootable="true">
+        <AttachedDevice type="HardDisk" port="0" device="0">
+          <Image uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}"/>
+        </AttachedDevice>
+        <AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
+      </StorageController>
+    </StorageControllers>
+  </Machine>
+</VirtualBox>
diff --git a/repos/ports/run/vm_ubuntu_64.vbox b/repos/ports/run/vm_ubuntu_14_04_64.vbox
similarity index 81%
rename from repos/ports/run/vm_ubuntu_64.vbox
rename to repos/ports/run/vm_ubuntu_14_04_64.vbox
index e2e56ae23..7e70bb52b 100644
--- a/repos/ports/run/vm_ubuntu_64.vbox
+++ b/repos/ports/run/vm_ubuntu_14_04_64.vbox
@@ -6,33 +6,30 @@
 ** Use VBoxManage or the VirtualBox Manager GUI to make changes.
 -->
 <VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.14-linux">
-  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="Win7" OSType="Windows7" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
+  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_14_04_64" OSType="Ubuntu_64" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
     <MediaRegistry>
       <HardDisks>
-        <HardDisk uuid="{64866074-88c8-43d4-8dce-886921a350d5}" location="/ubuntu_64.vdi" format="VDI" type="Immutable">
-          <HardDisk uuid="{3d9a9193-0fe7-4f8c-8e1b-065dbf514c82}" location="/ram/overlay_ubuntu_64.vdi" format="VDI" autoReset="true"/>
+        <HardDisk uuid="{58c7c166-9df5-45cf-b12c-a3132ac90078}" location="/ubuntu_14_04_64.vdi" format="VDI" type="Immutable">
+          <HardDisk uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}" location="/ram/overlay_ubuntu_14_04_64.vdi" format="VDI" autoReset="true"/>
         </HardDisk>
       </HardDisks>
       <DVDImages/>
       <FloppyImages/>
     </MediaRegistry>
-    <ExtraData>
-      <ExtraDataItem name="GUI/LastGuestSizeHint" value="1024,768"/>
-      <ExtraDataItem name="GUI/LastNormalWindowPosition" value="513,100,1024,790"/>
-    </ExtraData>
+    <ExtraData/>
     <Hardware version="2">
       <CPU count="2" hotplug="false">
         <HardwareVirtEx enabled="true"/>
         <HardwareVirtExNestedPaging enabled="true"/>
         <HardwareVirtExVPID enabled="true"/>
-        <HardwareVirtExUX enabled="true"/>
+        <HardwareVirtExUX enabled="false"/>
         <PAE enabled="true"/>
         <LongMode enabled="true"/>
         <HardwareVirtExLargePages enabled="false"/>
         <HardwareVirtForce enabled="false"/>
       </CPU>
       <Memory RAMSize="1024" PageFusion="false"/>
-      <HID Pointing="PS2Mouse" Keyboard="PS2Keyboard"/>
+      <HID Pointing="USBTablet" Keyboard="PS2Keyboard"/>
       <HPET enabled="false"/>
       <Chipset type="PIIX3"/>
       <Boot>
@@ -93,7 +90,7 @@
     <StorageControllers>
       <StorageController name="SATA" type="AHCI" PortCount="2" useHostIOCache="true" Bootable="true">
         <AttachedDevice type="HardDisk" port="0" device="0">
-          <Image uuid="{3d9a9193-0fe7-4f8c-8e1b-065dbf514c82}"/>
+          <Image uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}"/>
         </AttachedDevice>
         <AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
       </StorageController>
diff --git a/repos/ports/run/vm_ubuntu_16_04_32.vbox b/repos/ports/run/vm_ubuntu_16_04_32.vbox
new file mode 100644
index 000000000..a88380470
--- /dev/null
+++ b/repos/ports/run/vm_ubuntu_16_04_32.vbox
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+** DO NOT EDIT THIS FILE.
+** If you make changes to this file while any VirtualBox related application
+** is running, your changes will be overwritten later, without taking effect.
+** Use VBoxManage or the VirtualBox Manager GUI to make changes.
+-->
+<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.14-linux">
+  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_16_04_32" OSType="Ubuntu" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
+    <MediaRegistry>
+      <HardDisks>
+        <HardDisk uuid="{c68dc6fc-0e5a-45fc-9692-8e363ee63b3a}" location="/ubuntu_16_04_32.vdi" format="VDI" type="Immutable">
+          <HardDisk uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}" location="/ram/overlay_ubuntu_16_04_32.vdi" format="VDI" autoReset="true"/>
+        </HardDisk>
+      </HardDisks>
+      <DVDImages/>
+      <FloppyImages/>
+    </MediaRegistry>
+    <ExtraData/>
+    <Hardware version="2">
+      <CPU count="2" hotplug="false">
+        <HardwareVirtEx enabled="true"/>
+        <HardwareVirtExNestedPaging enabled="true"/>
+        <HardwareVirtExVPID enabled="true"/>
+        <HardwareVirtExUX enabled="false"/>
+        <PAE enabled="true"/>
+        <LongMode enabled="false"/>
+        <HardwareVirtExLargePages enabled="false"/>
+        <HardwareVirtForce enabled="false"/>
+      </CPU>
+      <Memory RAMSize="1024" PageFusion="false"/>
+      <HID Pointing="USBTablet" Keyboard="PS2Keyboard"/>
+      <HPET enabled="false"/>
+      <Chipset type="PIIX3"/>
+      <Boot>
+        <Order position="1" device="Floppy"/>
+        <Order position="2" device="DVD"/>
+        <Order position="3" device="HardDisk"/>
+        <Order position="4" device="None"/>
+      </Boot>
+      <Display VRAMSize="20" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/>
+      <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/>
+      <RemoteDisplay enabled="false" authType="Null"/>
+      <BIOS>
+        <ACPI enabled="true"/>
+        <IOAPIC enabled="true"/>
+        <Logo fadeIn="true" fadeOut="true" displayTime="0"/>
+        <BootMenu mode="MessageAndMenu"/>
+        <TimeOffset value="0"/>
+        <PXEDebug enabled="false"/>
+      </BIOS>
+      <USB>
+        <Controllers>
+          <Controller name="OHCI" type="OHCI"/>
+        </Controllers>
+        <DeviceFilters/>
+      </USB>
+      <Network>
+        <Adapter slot="0" enabled="false" MACAddress="0800271D7901" cable="true" speed="0" type="82540EM">
+          <HostInterface/>
+          <DisabledModes/>
+        </Adapter>
+      </Network>
+      <UART>
+        <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
+        <Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
+      </UART>
+      <LPT>
+        <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
+        <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
+      </LPT>
+      <AudioAdapter controller="HDA" driver="Pulse" enabled="false"/>
+      <RTC localOrUTC="UTC"/>
+      <SharedFolders/>
+      <Clipboard mode="Disabled"/>
+      <DragAndDrop mode="Disabled"/>
+      <IO>
+        <IoCache enabled="true" size="5"/>
+        <BandwidthGroups/>
+      </IO>
+      <HostPci>
+        <Devices/>
+      </HostPci>
+      <EmulatedUSB>
+        <CardReader enabled="false"/>
+      </EmulatedUSB>
+      <Guest memoryBalloonSize="0"/>
+      <GuestProperties/>
+    </Hardware>
+    <StorageControllers>
+      <StorageController name="SATA" type="AHCI" PortCount="2" useHostIOCache="true" Bootable="true">
+        <AttachedDevice type="HardDisk" port="0" device="0">
+          <Image uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}"/>
+        </AttachedDevice>
+        <AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
+      </StorageController>
+    </StorageControllers>
+  </Machine>
+</VirtualBox>
diff --git a/repos/ports/run/vm_ubuntu_16_04_64.vbox b/repos/ports/run/vm_ubuntu_16_04_64.vbox
new file mode 100644
index 000000000..dee5e940a
--- /dev/null
+++ b/repos/ports/run/vm_ubuntu_16_04_64.vbox
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+** DO NOT EDIT THIS FILE.
+** If you make changes to this file while any VirtualBox related application
+** is running, your changes will be overwritten later, without taking effect.
+** Use VBoxManage or the VirtualBox Manager GUI to make changes.
+-->
+<VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.14-linux">
+  <Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_16_04_64" OSType="Ubuntu_64" snapshotFolder="Snapshots" lastStateChange="2014-11-14T11:58:35Z">
+    <MediaRegistry>
+      <HardDisks>
+        <HardDisk uuid="{2a248ff9-7ac9-4862-98f9-14e31968f23d}" location="/ubuntu_16_04_64.vdi" format="VDI" type="Immutable">
+          <HardDisk uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}" location="/ram/overlay_ubuntu_16_04_64.vdi" format="VDI" autoReset="true"/>
+        </HardDisk>
+      </HardDisks>
+      <DVDImages/>
+      <FloppyImages/>
+    </MediaRegistry>
+    <ExtraData/>
+    <Hardware version="2">
+      <CPU count="2" hotplug="false">
+        <HardwareVirtEx enabled="true"/>
+        <HardwareVirtExNestedPaging enabled="true"/>
+        <HardwareVirtExVPID enabled="true"/>
+        <HardwareVirtExUX enabled="false"/>
+        <PAE enabled="true"/>
+        <LongMode enabled="true"/>
+        <HardwareVirtExLargePages enabled="false"/>
+        <HardwareVirtForce enabled="false"/>
+      </CPU>
+      <Memory RAMSize="1024" PageFusion="false"/>
+      <HID Pointing="USBTablet" Keyboard="PS2Keyboard"/>
+      <HPET enabled="false"/>
+      <Chipset type="PIIX3"/>
+      <Boot>
+        <Order position="1" device="Floppy"/>
+        <Order position="2" device="DVD"/>
+        <Order position="3" device="HardDisk"/>
+        <Order position="4" device="None"/>
+      </Boot>
+      <Display VRAMSize="20" monitorCount="1" accelerate3D="false" accelerate2DVideo="false"/>
+      <VideoCapture enabled="false" screens="18446744073709551615" horzRes="1024" vertRes="768" rate="512" fps="25"/>
+      <RemoteDisplay enabled="false" authType="Null"/>
+      <BIOS>
+        <ACPI enabled="true"/>
+        <IOAPIC enabled="true"/>
+        <Logo fadeIn="true" fadeOut="true" displayTime="0"/>
+        <BootMenu mode="MessageAndMenu"/>
+        <TimeOffset value="0"/>
+        <PXEDebug enabled="false"/>
+      </BIOS>
+      <USB>
+        <Controllers>
+          <Controller name="OHCI" type="OHCI"/>
+        </Controllers>
+        <DeviceFilters/>
+      </USB>
+      <Network>
+        <Adapter slot="0" enabled="false" MACAddress="0800271D7901" cable="true" speed="0" type="82540EM">
+          <HostInterface/>
+          <DisabledModes/>
+        </Adapter>
+      </Network>
+      <UART>
+        <Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
+        <Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
+      </UART>
+      <LPT>
+        <Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
+        <Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
+      </LPT>
+      <AudioAdapter controller="HDA" driver="Pulse" enabled="false"/>
+      <RTC localOrUTC="UTC"/>
+      <SharedFolders/>
+      <Clipboard mode="Disabled"/>
+      <DragAndDrop mode="Disabled"/>
+      <IO>
+        <IoCache enabled="true" size="5"/>
+        <BandwidthGroups/>
+      </IO>
+      <HostPci>
+        <Devices/>
+      </HostPci>
+      <EmulatedUSB>
+        <CardReader enabled="false"/>
+      </EmulatedUSB>
+      <Guest memoryBalloonSize="0"/>
+      <GuestProperties/>
+    </Hardware>
+    <StorageControllers>
+      <StorageController name="SATA" type="AHCI" PortCount="2" useHostIOCache="true" Bootable="true">
+        <AttachedDevice type="HardDisk" port="0" device="0">
+          <Image uuid="{78a3a6a1-ade6-41bf-8b29-ec7cf16de4bb}"/>
+        </AttachedDevice>
+        <AttachedDevice passthrough="false" type="DVD" port="1" device="0"/>
+      </StorageController>
+    </StorageControllers>
+  </Machine>
+</VirtualBox>
diff --git a/tool/autopilot.list b/tool/autopilot.list
index 9fa04a779..b6ebb20cc 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -47,7 +47,10 @@ blk_cache
 rump_ext2
 thread
 pthread
-vbox4_ubuntu_64
+vbox4_ubuntu_14_04_32
+vbox4_ubuntu_14_04_64
+vbox4_ubuntu_16_04_32
+vbox4_ubuntu_16_04_64
 vbox4_win7_32
 vbox4_win7_64
 vbox4_win7_64_raw
@@ -55,7 +58,10 @@ vbox4_win7_32_share
 vbox4_win7_64_multiple
 vbox4_win81_64
 vbox4_win10_64
-vbox5_ubuntu_64
+vbox5_ubuntu_14_04_32
+vbox5_ubuntu_14_04_64
+vbox5_ubuntu_16_04_32
+vbox5_ubuntu_16_04_64
 vbox5_win7_32
 vbox5_win7_64
 vbox5_win7_64_share