diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
index 9f9cc19c..b4a49762 100644
--- a/.config/molecule/config.yml
+++ b/.config/molecule/config.yml
@@ -23,18 +23,6 @@ platforms:
     privileged: true
     cgroup_parent: docker.slice
     command: /lib/systemd/systemd
-  - name: fedora-39
-    image: dokken/fedora-39
-    pre_build_image: true
-    privileged: true
-    cgroup_parent: docker.slice
-    command: /lib/systemd/systemd
-  - name: fedora-40
-    image: dokken/fedora-40
-    pre_build_image: true
-    privileged: true
-    cgroup_parent: docker.slice
-    command: /lib/systemd/systemd
   - name: ubuntu-20.04
     image: dokken/ubuntu-20.04
     pre_build_image: true
@@ -67,21 +55,11 @@ provisioner:
       target_hosts:
         hosts: {}
     host_vars:
-      fedora-39:
+      almalinux-8:
         exclude_ansible_vers:
-          - "2.9"
-          - "2.10"
-          - "2.11"
-      fedora-40:
-        exclude_ansible_vers:
-          - "2.9"
-          - "2.10"
-          - "2.11"
+          - "2.17"
       ubuntu-24.04:
         exclude_ansible_vers:
           - "2.9"
           - "2.10"
           - "2.11"
-      almalinux-8:
-        exclude_ansible_vers:
-          - "2.17"
diff --git a/roles/alertmanager/meta/main.yml b/roles/alertmanager/meta/main.yml
index 949cbe13..2e631dd3 100644
--- a/roles/alertmanager/meta/main.yml
+++ b/roles/alertmanager/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/bind_exporter/meta/main.yml b/roles/bind_exporter/meta/main.yml
index 13277846..36c68838 100644
--- a/roles/bind_exporter/meta/main.yml
+++ b/roles/bind_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/blackbox_exporter/meta/main.yml b/roles/blackbox_exporter/meta/main.yml
index 55710458..3fc9b8c1 100644
--- a/roles/blackbox_exporter/meta/main.yml
+++ b/roles/blackbox_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "exporter"
     - "monitoring"
diff --git a/roles/cadvisor/meta/main.yml b/roles/cadvisor/meta/main.yml
index a393540e..6104d124 100644
--- a/roles/cadvisor/meta/main.yml
+++ b/roles/cadvisor/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/chrony_exporter/meta/main.yml b/roles/chrony_exporter/meta/main.yml
index d175af47..84e26524 100644
--- a/roles/chrony_exporter/meta/main.yml
+++ b/roles/chrony_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/fail2ban_exporter/meta/main.yml b/roles/fail2ban_exporter/meta/main.yml
index 09e60201..e31754a0 100644
--- a/roles/fail2ban_exporter/meta/main.yml
+++ b/roles/fail2ban_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/ipmi_exporter/meta/main.yml b/roles/ipmi_exporter/meta/main.yml
index af60f050..b9522781 100644
--- a/roles/ipmi_exporter/meta/main.yml
+++ b/roles/ipmi_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/memcached_exporter/meta/main.yml b/roles/memcached_exporter/meta/main.yml
index 8fff353d..ed647cba 100644
--- a/roles/memcached_exporter/meta/main.yml
+++ b/roles/memcached_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/mongodb_exporter/meta/main.yml b/roles/mongodb_exporter/meta/main.yml
index bd4bb040..a79fdbae 100644
--- a/roles/mongodb_exporter/meta/main.yml
+++ b/roles/mongodb_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/mysqld_exporter/meta/main.yml b/roles/mysqld_exporter/meta/main.yml
index 84c3a47c..da539d6c 100644
--- a/roles/mysqld_exporter/meta/main.yml
+++ b/roles/mysqld_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/nginx_exporter/meta/main.yml b/roles/nginx_exporter/meta/main.yml
index ad376e7e..47b8c037 100644
--- a/roles/nginx_exporter/meta/main.yml
+++ b/roles/nginx_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/node_exporter/meta/main.yml b/roles/node_exporter/meta/main.yml
index ee5c71ea..d2fb61f9 100644
--- a/roles/node_exporter/meta/main.yml
+++ b/roles/node_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/postgres_exporter/meta/main.yml b/roles/postgres_exporter/meta/main.yml
index 620b4733..c7f2f7b5 100644
--- a/roles/postgres_exporter/meta/main.yml
+++ b/roles/postgres_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/process_exporter/meta/main.yml b/roles/process_exporter/meta/main.yml
index dab8709c..5f01c665 100644
--- a/roles/process_exporter/meta/main.yml
+++ b/roles/process_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml
index 355c8a5e..e0e8f5e2 100644
--- a/roles/prometheus/meta/main.yml
+++ b/roles/prometheus/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/pushgateway/meta/main.yml b/roles/pushgateway/meta/main.yml
index f6371cf1..e463ccf7 100644
--- a/roles/pushgateway/meta/main.yml
+++ b/roles/pushgateway/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/redis_exporter/meta/main.yml b/roles/redis_exporter/meta/main.yml
index 685122ab..e8f68e48 100644
--- a/roles/redis_exporter/meta/main.yml
+++ b/roles/redis_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/smartctl_exporter/meta/main.yml b/roles/smartctl_exporter/meta/main.yml
index 750437e1..f0d7305e 100644
--- a/roles/smartctl_exporter/meta/main.yml
+++ b/roles/smartctl_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/smokeping_prober/meta/main.yml b/roles/smokeping_prober/meta/main.yml
index 1882e861..6742ea26 100644
--- a/roles/smokeping_prober/meta/main.yml
+++ b/roles/smokeping_prober/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/snmp_exporter/meta/main.yml b/roles/snmp_exporter/meta/main.yml
index f356bb20..71f0550a 100644
--- a/roles/snmp_exporter/meta/main.yml
+++ b/roles/snmp_exporter/meta/main.yml
@@ -17,10 +17,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"
diff --git a/roles/systemd_exporter/meta/main.yml b/roles/systemd_exporter/meta/main.yml
index b3cd6f42..0a55292f 100644
--- a/roles/systemd_exporter/meta/main.yml
+++ b/roles/systemd_exporter/meta/main.yml
@@ -18,10 +18,6 @@ galaxy_info:
       versions:
         - "8"
         - "9"
-    - name: "Fedora"
-      versions:
-        - "39"
-        - "40"
   galaxy_tags:
     - "monitoring"
     - "prometheus"