diff --git a/device/device-qemu-aarch64/APKBUILD b/device/device-qemu-aarch64/APKBUILD
index be58be0d3..3923d416d 100644
--- a/device/device-qemu-aarch64/APKBUILD
+++ b/device/device-qemu-aarch64/APKBUILD
@@ -1,9 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
+# Contributor: Minecrell <minecrell@minecrell.net>
 pkgname=device-qemu-aarch64
-pkgver=1
-pkgrel=19
-pkgdesc="Simulated device in qemu with vexpress soc"
+pkgver=2
+pkgrel=0
+pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
 license="MIT"
@@ -11,9 +12,11 @@ depends="postmarketos-base mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-weston
-	$pkgname-kernel-lts:kernel_lts
+	$pkgname-xfce4
 	$pkgname-kernel-virt:kernel_virt
+	$pkgname-kernel-lts:kernel_lts
 "
+
 source="deviceinfo weston.ini"
 options="!check !archcheck"
 
@@ -31,6 +34,12 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
+xfce4() {
+	install_if="$pkgname postmarketos-ui-xfce4"
+	install="$subpkgname.post-install"
+	mkdir "$subpkgdir"
+}
+
 kernel_virt() {
 	pkgdesc="Alpine Virt kernel (minimal, no audio)"
 	depends="linux-virt"
@@ -43,5 +52,5 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-sha512sums="4f6954f0e7c75b431e42f3f4c6fc4ad7c366550c8948c382ee5b7314b4cd85ccb9433489e94cd410797afd838246d582d0d34789b1349b64dde2a0cea9316f1c  deviceinfo
+sha512sums="e90b874579a98701dda077c9ea699c4e25d8b581c41d4e7f267c12a2a945b2c877b6dfe67d5afb706f719c5d9493c037f6c3facc988e38d0be7f3fd7df370e6d  deviceinfo
 de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini"
diff --git a/device/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install b/device/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install
new file mode 100644
index 000000000..31470445b
--- /dev/null
+++ b/device/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed -i 's/monitor0/monitorVirtual-1/' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/device/device-qemu-aarch64/deviceinfo b/device/device-qemu-aarch64/deviceinfo
index ee6213802..01ace3725 100644
--- a/device/device-qemu-aarch64/deviceinfo
+++ b/device/device-qemu-aarch64/deviceinfo
@@ -5,16 +5,17 @@ deviceinfo_format_version="0"
 deviceinfo_name="QEMU aarch64"
 deviceinfo_manufacturer="QEMU"
 deviceinfo_codename="qemu-aarch64"
-deviceinfo_keyboard="true"
 deviceinfo_dtb=""
-deviceinfo_modules_initfs="virtio_mmio virtio_blk virtio-gpu virtio-pci virtio_net qxl drm_bochs"
-deviceinfo_external_storage="true"
-deviceinfo_flash_method="none"
-deviceinfo_generate_legacy_uboot_initfs="false"
+deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input"
 deviceinfo_arch="aarch64"
-deviceinfo_kernel_cmdline="console=ttyAMA0,38400n8 console=tty1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
-deviceinfo_disable_dhcpd="true"
 
-# Splash
+# Device related
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="768"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=tty1 console=ttyAMA0,38400n8 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_disable_dhcpd="true"
diff --git a/device/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD
index fd60df44a..f5f832a7e 100644
--- a/device/device-qemu-amd64/APKBUILD
+++ b/device/device-qemu-amd64/APKBUILD
@@ -1,16 +1,16 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
+# Contributor: Minecrell <minecrell@minecrell.net>
 pkgname=device-qemu-amd64
-pkgver=1
-pkgrel=26
-pkgdesc="Simulated device in qemu with an x86 platform"
+pkgver=2
+pkgrel=0
+pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
 arch="x86_64"
 license="MIT"
 depends="postmarketos-base mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-x11
 	$pkgname-weston
 	$pkgname-xfce4
 	$pkgname-kernel-virt:kernel_virt
@@ -28,12 +28,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-x11() {
-	install_if="$pkgname xorg-server"
-	depends="xf86-video-qxl"
-	mkdir "$subpkgdir"
-}
-
 weston() {
 	install_if="$pkgname weston"
 	install -Dm644 "$srcdir"/weston.ini \
@@ -58,5 +52,5 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-sha512sums="72d928f9d6fb6835e86678b4e9298c183f32abd63b6ba20fd1e008b2f20dc92c2a8f128ab21655da00b266eb972d0b07f6bac00186199b313033d4edc753d3ac  deviceinfo
+sha512sums="de21a746c2c7d2001238d0b266607b51007e319c7a645f2f3ca090285f628f7473b961741f480355b38df40de5892bbfba6012593b4b648b9724b1ba0b643a51  deviceinfo
 47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142  weston.ini"
diff --git a/device/device-qemu-amd64/deviceinfo b/device/device-qemu-amd64/deviceinfo
index 6c246d7f6..71157fffb 100644
--- a/device/device-qemu-amd64/deviceinfo
+++ b/device/device-qemu-amd64/deviceinfo
@@ -5,16 +5,17 @@ deviceinfo_format_version="0"
 deviceinfo_name="QEMU amd64"
 deviceinfo_manufacturer="QEMU"
 deviceinfo_codename="qemu-amd64"
-deviceinfo_keyboard="true"
 deviceinfo_dtb=""
-deviceinfo_modules_initfs="ata_piix sd_mod virtio_scsi qxl drm_bochs virtio-gpu virtio-pci"
-deviceinfo_external_storage="true"
-deviceinfo_flash_method="none"
-deviceinfo_generate_legacy_uboot_initfs="false"
+deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input"
 deviceinfo_arch="x86_64"
-deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
-deviceinfo_disable_dhcpd="true"
 
-# Splash
+# Device related
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="768"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_disable_dhcpd="true"