diff --git a/virtual-machines/MacEmu/OS9 b/virtual-machines/MacEmu/OS9
index 752c0dc..f30f7bb 100644
--- a/virtual-machines/MacEmu/OS9
+++ b/virtual-machines/MacEmu/OS9
@@ -1 +1,2 @@
 disk /media/store/vm/MacEmu/OS9
+disk /media/store/vm/MacEmu/Data
diff --git a/virtual-machines/MacEmu/OS9JP b/virtual-machines/MacEmu/OS9JP
new file mode 100644
index 0000000..5d678d5
--- /dev/null
+++ b/virtual-machines/MacEmu/OS9JP
@@ -0,0 +1 @@
+disk /media/store/vm/MacEmu/OS9JP
diff --git a/virtual-machines/MacEmu/OldOS9 b/virtual-machines/MacEmu/OldOS9
deleted file mode 100644
index cec2755..0000000
--- a/virtual-machines/MacEmu/OldOS9
+++ /dev/null
@@ -1,2 +0,0 @@
-disk /media/store/vm/MacEmu/OS9.hfv
-disk /media/store/vm/MacEmu/Data.hfx
diff --git a/virtual-machines/QEMU/UbuntuServer b/virtual-machines/QEMU/UbuntuServer
new file mode 100644
index 0000000..3f00ff6
--- /dev/null
+++ b/virtual-machines/QEMU/UbuntuServer
@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+
+set _arch x86_64
+set _ver 20.04.2
+set _install "Linux/Ubuntu/_ver_-live-server-amd64.iso"
+set _mem 8G
+set _args \
+	--fsdev local,security_model=passthrough,id=fsdev0,path=$HOME/vmshare \
+	--device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare