diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index df267c4..9d558e7 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -40,7 +40,11 @@ jobs:
           - image: "debian"
             tag: "bookworm"
           - image: "fedora"
-            tag: "36"
+            tag: "37"
+          - image: "fedora"
+            tag: "latest"
+          - image: "fedora"
+            tag: "rawhide"
           - image: "ubuntu"
             tag: "latest"
           - image: "ubuntu"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d501c59..4642339 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,11 @@ molecule:
       - image: "debian"
         tag: "bookworm"
       - image: "fedora"
-        tag: "36"
+        tag: "37"
+      - image: "fedora"
+        tag: "latest"
+      - image: "fedora"
+        tag: "rawhide"
       - image: "ubuntu"
         tag: "latest"
       - image: "ubuntu"
diff --git a/README.md b/README.md
index f555b1c..a429e7e 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 |[Amazon](https://hub.docker.com/repository/docker/robertdebock/amazonlinux/general)|Candidate|
 |[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)|36|
+|[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
 |[Ubuntu](https://hub.docker.com/repository/docker/robertdebock/ubuntu/general)|all|
 
 The minimum version of Ansible required is 2.12, tests have been done to:
diff --git a/meta/main.yml b/meta/main.yml
index 152e2e1..05a5126 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -20,7 +20,7 @@ galaxy_info:
         - all
     - name: Fedora
       versions:
-        - "36"
+        - all
     - name: Ubuntu
       versions:
         - all