diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ac42dc29..e0d71488 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -60,6 +60,7 @@ jobs:
           - "debian-9"
           - "debian-10"
           - "ubuntu-1804"
+          - "ubuntu-2004"
         puppet:
           - "puppet6"
           - "puppet7"
diff --git a/.sync.yml b/.sync.yml
index e6d05c6b..f6050dfe 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -18,6 +18,7 @@
       - debian-9
       - debian-10
       - ubuntu-1804
+      - ubuntu-2004
     puppet:
       - puppet6
       - puppet7
diff --git a/README.md b/README.md
index 17f27e6f..6753c41e 100644
--- a/README.md
+++ b/README.md
@@ -538,7 +538,9 @@ keycloak_required_action { 'webauthn-register on master':
 
 This module has been tested on:
 
-* CentOS 7 x86_64
-* RedHat 7 x86_64
+* RedHat/CentOS 7 x86_64
+* RedHat/CentOS 8 x86_64
 * Debian 9 x86_64
+* Debian 10 x86_64
 * Ubuntu 18.04 x86_64
+* Ubuntu 20.04 x86_64
diff --git a/metadata.json b/metadata.json
index b2b469b4..e44a9a36 100644
--- a/metadata.json
+++ b/metadata.json
@@ -77,7 +77,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     }
   ],
diff --git a/spec/acceptance/nodesets/ubuntu-2004.yml b/spec/acceptance/nodesets/ubuntu-2004.yml
new file mode 100644
index 00000000..5ea5eeeb
--- /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 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: 'keycloak-ubuntu2004'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+