diff --git a/configs/sst_virt_tools-subsystem.yaml b/configs/sst_virt_tools-subsystem.yaml
index 0f4fbb09..78968cfc 100644
--- a/configs/sst_virt_tools-subsystem.yaml
+++ b/configs/sst_virt_tools-subsystem.yaml
@@ -15,6 +15,7 @@ data:
     - mdevctl
     - osinfo-db
     - osinfo-db-tools
+    - python3-libvirt
     - virt-install
     - virt-viewer
     - virt-what
@@ -25,15 +26,18 @@ data:
     x86_64:
       - guestfs-tools
       - libguestfs
+      - supermin
       - virt-p2v
       - virt-top
       - virt-v2v
     aarch64:
       - guestfs-tools
       - libguestfs
+      - libguestfs-inspect-icons
       - supermin
       - virt-top
     s390x:
+      - libguestfs-inspect-icons
       - guestfs-tools
       - libguestfs
       - supermin
diff --git a/configs/sst_virtualization-all.yaml b/configs/sst_virtualization-all.yaml
index cd738b75..62506bb3 100644
--- a/configs/sst_virtualization-all.yaml
+++ b/configs/sst_virtualization-all.yaml
@@ -15,7 +15,6 @@ data:
     - nbdkit
     - passt
     - python-augeas
-    - python3-libvirt
     - uki-direct
     - vhostmd
   labels:
@@ -29,13 +28,10 @@ data:
       - snphost
       - spice-protocol
       - spice-vdagent
-      - supermin
       - trustee-guest-components
     ppc64le:
       - powerpc-utils
     aarch64:
-      - libguestfs-inspect-icons
       - qemu-kvm
     s390x:
-      - libguestfs-inspect-icons
       - qemu-kvm