diff --git a/.sync.yml b/.sync.yml
index f698519..43f1e6f 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -11,11 +11,3 @@
   delete: true
 appveyor.yml:
   delete: true
-spec/acceptance/nodesets/debian-10.yml:
-  delete: true
-spec/acceptance/nodesets/debian-11.yml:
-  delete: true
-spec/acceptance/nodesets/ubuntu-2004.yml:
-  delete: true
-spec/acceptance/nodesets/ubuntu-2204.yml:
-  delete: true
diff --git a/metadata.json b/metadata.json
index f456c90..628d992 100644
--- a/metadata.json
+++ b/metadata.json
@@ -49,13 +49,15 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9"
+        "10",
+        "11"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],
diff --git a/spec/acceptance/nodesets/debian-10.yml b/spec/acceptance/nodesets/debian-10.yml
new file mode 100644
index 0000000..57cb677
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-10.yml
@@ -0,0 +1,28 @@
+HOSTS:
+  debian10:
+    roles:
+      - agent
+    platform: debian-10-amd64
+    hypervisor: docker
+    image: debian:10
+    docker_preserve_image: true
+    docker_cmd:
+      - '/sbin/init'
+    docker_image_commands:
+      - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates'
+      - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
+      - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
+      - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
+      - 'locale-gen en_US.UTF-8'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'kdump-debian10'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/acceptance/nodesets/debian-11.yml b/spec/acceptance/nodesets/debian-11.yml
new file mode 100644
index 0000000..09a1f0f
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-11.yml
@@ -0,0 +1,28 @@
+HOSTS:
+  debian11:
+    roles:
+      - agent
+    platform: debian-11-amd64
+    hypervisor: docker
+    image: debian:11
+    docker_preserve_image: true
+    docker_cmd:
+      - '/sbin/init'
+    docker_image_commands:
+      - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates'
+      - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
+      - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
+      - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
+      - 'locale-gen en_US.UTF-8'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'kdump-debian11'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/acceptance/nodesets/el9.yml b/spec/acceptance/nodesets/el9.yml
new file mode 100644
index 0000000..5abc780
--- /dev/null
+++ b/spec/acceptance/nodesets/el9.yml
@@ -0,0 +1,26 @@
+HOSTS:
+  almalinux-9:
+    roles:
+      - agent
+    platform: el-9-x86_64
+    hypervisor: docker
+    image: almalinux:9
+    docker_preserve_image: true
+    docker_cmd:
+      - '/usr/sbin/init'
+    docker_image_commands:
+      - 'dnf install -y dnf-utils'
+      - 'dnf config-manager --set-enabled crb'
+      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks glibc-langpack-en cpio'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'kdump-el9'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/acceptance/nodesets/ubuntu-2004.yml b/spec/acceptance/nodesets/ubuntu-2004.yml
new file mode 100644
index 0000000..c9b51b6
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-2004.yml
@@ -0,0 +1,25 @@
+HOSTS:
+  ubuntu2004:
+    roles:
+      - agent
+    platform: ubuntu-20.04-amd64
+    hypervisor : docker
+    image: ubuntu:20.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
+      - 'locale-gen en_US.UTF-8'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'kdump-ubuntu2004'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/acceptance/nodesets/ubuntu-2204.yml b/spec/acceptance/nodesets/ubuntu-2204.yml
new file mode 100644
index 0000000..0af9ee7
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-2204.yml
@@ -0,0 +1,25 @@
+HOSTS:
+  ubuntu2204:
+    roles:
+      - agent
+    platform: ubuntu-22.04-amd64
+    hypervisor : docker
+    image: ubuntu:22.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
+      - 'locale-gen en_US.UTF-8'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'kdump-ubuntu2204'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+