diff --git a/metadata.json b/metadata.json
index 3483fac..ede89b6 100644
--- a/metadata.json
+++ b/metadata.json
@@ -27,7 +27,9 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04",
+        "22.04"
       ]
     },
     {
diff --git a/spec/acceptance/nodesets/docker/ubuntu-20.04.yml b/spec/acceptance/nodesets/docker/ubuntu-20.04.yml
new file mode 100644
index 0000000..1f10a71
--- /dev/null
+++ b/spec/acceptance/nodesets/docker/ubuntu-20.04.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  ubuntu-2004-x64:
+    platform: ubuntu-20.04-amd64
+    hypervisor: docker
+    image: ubuntu:20.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      # ensure that systemd is working correctly in the container and install necessary packages
+      - 'apt-get update && apt-get install -y systemd systemd-sysv net-tools wget locales && locale-gen en_US.UTF-8'
+CONFIG:
+  trace_limit: 200
diff --git a/spec/acceptance/nodesets/docker/ubuntu-22.04.yml b/spec/acceptance/nodesets/docker/ubuntu-22.04.yml
new file mode 100644
index 0000000..51f8a7c
--- /dev/null
+++ b/spec/acceptance/nodesets/docker/ubuntu-22.04.yml
@@ -0,0 +1,12 @@
+HOSTS:
+  ubuntu-2204-x64:
+    platform: ubuntu-22.04-amd64
+    hypervisor: docker
+    image: ubuntu:22.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      # ensure that systemd is working correctly in the container and install necessary packages
+      - 'apt-get update && apt-get install -y systemd systemd-sysv net-tools wget locales && locale-gen en_US.UTF-8'
+CONFIG:
+  trace_limit: 200