diff --git a/.github/settings.yml b/.github/settings.yml
index b4928d0..cf90157 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -5,4 +5,4 @@
 repository:
   description: Set alternatives
   homepage: https://robertdebock.nl/
-  topics: alternatives, ansible, molecule, tox, playbook
+  topics: alternatives, system, ansible, molecule, tox, playbook
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index ec699c2..2b53621 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -35,6 +35,8 @@ jobs:
             tag: "latest"
           - image: "enterpriselinux"
             tag: "8"
+          - image: "enterpriselinux"
+            tag: "latest"
           - image: "debian"
             tag: "latest"
           - image: "debian"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 669022f..b93d359 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,8 @@ molecule:
         tag: "latest"
       - image: "enterpriselinux"
         tag: "8"
+      - image: "enterpriselinux"
+        tag: "latest"
       - image: "debian"
         tag: "latest"
       - image: "debian"
diff --git a/README.md b/README.md
index f19837d..6b5c0ed 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |---------|----|
 |[Alpine](https://hub.docker.com/repository/docker/robertdebock/alpine/general)|all|
 |[Amazon](https://hub.docker.com/repository/docker/robertdebock/amazonlinux/general)|Candidate|
-|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8|
+|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8, 9|
 |[Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)|all|
 |[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
 |[opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)|all|
diff --git a/meta/main.yml b/meta/main.yml
index a87745c..b52439d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -17,6 +17,7 @@ galaxy_info:
     - name: EL
       versions:
         - "8"
+        - "9"
     - name: Debian
       versions:
         - all
@@ -32,5 +33,6 @@ galaxy_info:
 
   galaxy_tags:
     - alternatives
+    - system
 
 dependencies: []
diff --git a/tox.ini b/tox.ini
index 27bf4b2..708d5bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,16 +3,16 @@
 #
 [tox]
 minversion = 4.2.4
-envlist = py{310}-ansible{5,6,7}
+envlist = py{310}-ansible{6,7,8}
 
 skipsdist = true
 
 [testenv]
 deps =
     -rrequirements.txt
-    ansible5: ansible == 5.*
     ansible6: ansible == 6.*
     ansible7: ansible == 7.*
+    ansible8: ansible == 8.*
 commands = molecule test
 setenv =
     TOX_ENVNAME={envname}