diff --git a/dishes/desktop-hypervisor-amdcpu.cfg b/dishes/desktop-hypervisor-amdcpu.cfg
index 882725b..21bf87c 100644
--- a/dishes/desktop-hypervisor-amdcpu.cfg
+++ b/dishes/desktop-hypervisor-amdcpu.cfg
@@ -269,7 +269,6 @@ gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
-guestfs-tools
 hostname
 intel-audio-firmware
 intel-gpu-firmware
@@ -283,11 +282,22 @@ kbd
 kernel
 less
 libertas-firmware
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 man-db
 mesa-dri-drivers
 mozilla-ublock-origin.noarch
@@ -307,7 +317,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-kvm
 realtek-firmware
 rootfiles
@@ -326,7 +335,6 @@ util-linux
 vim-minimal
 virt-install
 virt-manager
-virt-top
 wget
 wpa_supplicant
 zram-generator-defaults
diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
index 7358709..740acf9 100644
--- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -279,7 +279,6 @@ gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
-guestfs-tools
 hostname
 intel-audio-firmware
 intel-gpu-firmware
@@ -293,11 +292,22 @@ kbd
 kernel
 less
 libertas-firmware
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 man-db
 mesa-dri-drivers
 mozilla-ublock-origin.noarch
@@ -317,7 +327,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-kvm
 realtek-firmware
 rootfiles
@@ -336,7 +345,6 @@ util-linux
 vim-minimal
 virt-install
 virt-manager
-virt-top
 wget
 wpa_supplicant
 zram-generator-defaults
diff --git a/dishes/desktop-hypervisor-intelcpu.cfg b/dishes/desktop-hypervisor-intelcpu.cfg
index bd64a97..d9a77bb 100644
--- a/dishes/desktop-hypervisor-intelcpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu.cfg
@@ -269,7 +269,6 @@ gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
-guestfs-tools
 hostname
 intel-audio-firmware
 intel-gpu-firmware
@@ -283,11 +282,22 @@ kbd
 kernel
 less
 libertas-firmware
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 man-db
 mesa-dri-drivers
 mozilla-ublock-origin.noarch
@@ -307,7 +317,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-kvm
 realtek-firmware
 rootfiles
@@ -326,7 +335,6 @@ util-linux
 vim-minimal
 virt-install
 virt-manager
-virt-top
 wget
 wpa_supplicant
 zram-generator-defaults
diff --git a/dishes/desktop-hypervisor.cfg b/dishes/desktop-hypervisor.cfg
index db5678f..7808561 100644
--- a/dishes/desktop-hypervisor.cfg
+++ b/dishes/desktop-hypervisor.cfg
@@ -261,7 +261,6 @@ gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
-guestfs-tools
 hostname
 intel-audio-firmware
 intel-gpu-firmware
@@ -275,11 +274,22 @@ kbd
 kernel
 less
 libertas-firmware
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 man-db
 mesa-dri-drivers
 mozilla-ublock-origin.noarch
@@ -299,7 +309,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-kvm
 realtek-firmware
 rootfiles
@@ -318,7 +327,6 @@ util-linux
 vim-minimal
 virt-install
 virt-manager
-virt-top
 wget
 wpa_supplicant
 zram-generator-defaults
diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop-hypervisor.cfg
index abce4f0..31b2e37 100644
--- a/dishes/live-desktop-hypervisor.cfg
+++ b/dishes/live-desktop-hypervisor.cfg
@@ -321,7 +321,6 @@ gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
-guestfs-tools
 hostname
 intel-audio-firmware
 intel-gpu-firmware
@@ -337,11 +336,22 @@ kernel-modules
 kernel-modules-extra
 less
 libertas-firmware
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 livesys-scripts
 man-db
 mesa-dri-drivers
@@ -362,7 +372,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-kvm
 realtek-firmware
 rootfiles
@@ -381,7 +390,6 @@ util-linux
 vim-minimal
 virt-install
 virt-manager
-virt-top
 wget
 wpa_supplicant
 zram-generator-defaults
diff --git a/dishes/live-server-hypervisor.cfg b/dishes/live-server-hypervisor.cfg
index f665ebe..8e5aaaf 100644
--- a/dishes/live-server-hypervisor.cfg
+++ b/dishes/live-server-hypervisor.cfg
@@ -165,7 +165,6 @@ generic-release-common
 generic-release-notes
 glibc
 glibc-all-langpacks
-guestfs-tools
 hostname
 initial-setup
 intel-audio-firmware
@@ -182,11 +181,22 @@ kernel-modules
 kernel-modules-extra
 less
 libertas-firmware
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 livesys-scripts
 man-db
 mt7xxx-firmware
@@ -202,7 +212,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-kvm
 realtek-firmware
 rootfiles
@@ -220,7 +229,6 @@ usbutils
 util-linux
 vim-minimal
 virt-install
-virt-top
 wget
 zram-generator-defaults
 
diff --git a/dishes/virtual-desktop-hypervisor.cfg b/dishes/virtual-desktop-hypervisor.cfg
index 89a60bd..17ac794 100644
--- a/dishes/virtual-desktop-hypervisor.cfg
+++ b/dishes/virtual-desktop-hypervisor.cfg
@@ -254,18 +254,28 @@ gnome-control-center
 gnome-initial-setup
 gnome-shell
 gnome-terminal
-guestfs-tools
 hostname
 iproute
 iputils
 kbd
 kernel
 less
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 man-db
 mesa-dri-drivers
 mozilla-ublock-origin.noarch
@@ -282,7 +292,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-guest-agent
 qemu-kvm
 rootfiles
@@ -301,7 +310,6 @@ util-linux
 vim-minimal
 virt-install
 virt-manager
-virt-top
 wget
 wpa_supplicant
 zram-generator-defaults
diff --git a/dishes/virtual-server-hypervisor.cfg b/dishes/virtual-server-hypervisor.cfg
index b6d9675..ba30ec5 100644
--- a/dishes/virtual-server-hypervisor.cfg
+++ b/dishes/virtual-server-hypervisor.cfg
@@ -98,7 +98,6 @@ generic-release
 generic-release-common
 generic-release-notes
 glibc
-guestfs-tools
 hostname
 initial-setup
 iproute
@@ -106,11 +105,22 @@ iputils
 kbd
 kernel
 less
-libguestfs-tools
 libusb
 libvirt
+libvirt-client
+libvirt-client-qemu
+libvirt-daemon
+libvirt-daemon-common
 libvirt-daemon-config-network
+libvirt-daemon-driver-ch
+libvirt-daemon-driver-interface
+libvirt-daemon-driver-network
+libvirt-daemon-driver-qemu
 libvirt-daemon-kvm
+libvirt-daemon-log
+libvirt-daemon-qemu
+libvirt-dbus
+libvirt-nss
 man-db
 nano
 ncurses
@@ -122,7 +132,6 @@ plymouth
 policycoreutils
 prefixdevname
 procps-ng
-python3-libguestfs
 qemu-guest-agent
 qemu-kvm
 rootfiles
@@ -140,7 +149,6 @@ usbutils
 util-linux
 vim-minimal
 virt-install
-virt-top
 wget
 zram-generator-defaults