diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70381df..0cbbdda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,7 +144,7 @@ rubocop:
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
 # default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
-# default-debian-11-master-py3: {extends: '.test_instance'}
+default-debian-11-master-py3: {extends: '.test_instance'}
 default-debian-10-master-py3: {extends: '.test_instance'}
 # clean-debian-10-master-py3: {extends: '.test_instance'}
 default-debian-9-master-py3: {extends: '.test_instance'}
diff --git a/libvirt/parameters/os_family/Debian.yaml b/libvirt/parameters/os_family/Debian.yaml
index b594d72..6cf3a31 100644
--- a/libvirt/parameters/os_family/Debian.yaml
+++ b/libvirt/parameters/os_family/Debian.yaml
@@ -12,13 +12,12 @@
 values:
   libvirt_pkg: libvirt-daemon-system
   libvirt_service: libvirtd
-  qemu_pkg: qemu-kvm
+  qemu_pkg: qemu-system-x86
   python2_pkg: python-libvirt
   python3_pkg: python3-libvirt
   extra_pkgs:
     - libguestfs0
     - libguestfs-tools
     - gnutls-bin
-    - virt-top
   daemon_config_path: /etc/default
 ...
diff --git a/libvirt/parameters/osfinger/Ubuntu-16.04.yaml b/libvirt/parameters/osfinger/Debian-9.yaml
similarity index 83%
rename from libvirt/parameters/osfinger/Ubuntu-16.04.yaml
rename to libvirt/parameters/osfinger/Debian-9.yaml
index 0ea5750..977da64 100644
--- a/libvirt/parameters/osfinger/Ubuntu-16.04.yaml
+++ b/libvirt/parameters/osfinger/Debian-9.yaml
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 #
-# Setup variables specific to salt['config.get']('osfinger') == Ubuntu-16.04.
+# Setup variables specific to salt['config.get']('osfinger') == Debian-9.
 # You just need to add the key:values for this `osfinger` that differ
 # from `defaults.yaml`.
 #
@@ -10,6 +10,7 @@
 # values: {}
 ---
 values:
-  libvirt_pkg: libvirt-bin
-  libvirt_service: libvirt-bin
+  extra_pkgs:
+    - gnutls-bin
+  qemu_pkg: qemu-kvm
 ...
diff --git a/libvirt/parameters/osfinger/Ubuntu-22.04.yaml b/libvirt/parameters/osfinger/Ubuntu-18.04.yaml
similarity index 89%
rename from libvirt/parameters/osfinger/Ubuntu-22.04.yaml
rename to libvirt/parameters/osfinger/Ubuntu-18.04.yaml
index fd70503..83c9146 100644
--- a/libvirt/parameters/osfinger/Ubuntu-22.04.yaml
+++ b/libvirt/parameters/osfinger/Ubuntu-18.04.yaml
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 #
-# Setup variables specific to salt['config.get']('osfinger') == Ubuntu-22.04.
+# Setup variables specific to salt['config.get']('osfinger') == Ubuntu-18.04.
 # You just need to add the key:values for this `osfinger` that differ
 # from `defaults.yaml`.
 #
@@ -10,5 +10,5 @@
 # values: {}
 ---
 values:
-  qemu_pkg: qemu-system-x86
+  qemu_pkg: qemu-kvm
 ...
diff --git a/libvirt/parameters/osfinger/Ubuntu-20.04.yaml b/libvirt/parameters/osfinger/Ubuntu-20.04.yaml
new file mode 100644
index 0000000..de494c1
--- /dev/null
+++ b/libvirt/parameters/osfinger/Ubuntu-20.04.yaml
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Setup variables specific to salt['config.get']('osfinger') == Ubuntu-20.04.
+# You just need to add the key:values for this `osfinger` that differ
+# from `defaults.yaml`.
+#
+# If you do not need to provide defaults via the `osfinger` config,
+# you can remove this file or provide at least an empty dict, e.g.
+# values: {}
+---
+values:
+  qemu_pkg: qemu-kvm
+...