diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index de1b950..0e34ad7 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -42,9 +42,11 @@ jobs:
           - image: "debian"
             tag: "bookworm"
           - image: "fedora"
-            tag: "36"
+            tag: "37"
           - image: "fedora"
             tag: "latest"
+          - image: "fedora"
+            tag: "rawhide"
           - image: "opensuse"
             tag: "latest"
           - image: "ubuntu"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c10ebdc..c4c1c71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,9 +25,11 @@ molecule:
       - image: "debian"
         tag: "bookworm"
       - image: "fedora"
-        tag: "36"
+        tag: "37"
       - image: "fedora"
         tag: "latest"
+      - image: "fedora"
+        tag: "rawhide"
       - image: "opensuse"
         tag: "latest"
       - image: "ubuntu"
diff --git a/README.md b/README.md
index 55e95d2..d33b449 100644
--- a/README.md
+++ b/README.md
@@ -171,7 +171,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, 37|
+|[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
 |[opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)|all|
 |[Ubuntu](https://hub.docker.com/repository/docker/robertdebock/ubuntu/general)|all|
 
diff --git a/meta/main.yml b/meta/main.yml
index b30b7a0..c05d52a 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -23,8 +23,7 @@ galaxy_info:
         - all
     - name: Fedora
       versions:
-        - "36"
-        - "37"
+        - all
     - name: opensuse
       versions:
         - all