diff --git a/.config/molecule/config.yml b/.config/molecule/config.yml
index abc65e87..d1932324 100644
--- a/.config/molecule/config.yml
+++ b/.config/molecule/config.yml
@@ -46,12 +46,6 @@ platforms:
     privileged: true
     cgroup_parent: docker.slice
     command: /lib/systemd/systemd
-  - name: fedora-36
-    image: dokken/fedora-36
-    pre_build_image: true
-    privileged: true
-    cgroup_parent: docker.slice
-    command: /lib/systemd/systemd
   - name: fedora-37
     image: dokken/fedora-37
     pre_build_image: true
diff --git a/roles/alertmanager/meta/main.yml b/roles/alertmanager/meta/main.yml
index 36ebeb50..5c3e8654 100644
--- a/roles/alertmanager/meta/main.yml
+++ b/roles/alertmanager/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/blackbox_exporter/meta/main.yml b/roles/blackbox_exporter/meta/main.yml
index f0597c21..fcb0c7fe 100644
--- a/roles/blackbox_exporter/meta/main.yml
+++ b/roles/blackbox_exporter/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "exporter"
diff --git a/roles/chrony_exporter/meta/main.yml b/roles/chrony_exporter/meta/main.yml
index 4bf81cc1..9d63f7b4 100644
--- a/roles/chrony_exporter/meta/main.yml
+++ b/roles/chrony_exporter/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/mysqld_exporter/meta/main.yml b/roles/mysqld_exporter/meta/main.yml
index 6a660a78..8cdea9d7 100644
--- a/roles/mysqld_exporter/meta/main.yml
+++ b/roles/mysqld_exporter/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/node_exporter/meta/main.yml b/roles/node_exporter/meta/main.yml
index 180557dd..b4141110 100644
--- a/roles/node_exporter/meta/main.yml
+++ b/roles/node_exporter/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/prometheus/meta/main.yml b/roles/prometheus/meta/main.yml
index 42dd07da..2a170398 100644
--- a/roles/prometheus/meta/main.yml
+++ b/roles/prometheus/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/pushgateway/meta/main.yml b/roles/pushgateway/meta/main.yml
index 2e5e2879..67a78d55 100644
--- a/roles/pushgateway/meta/main.yml
+++ b/roles/pushgateway/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/smokeping_prober/meta/main.yml b/roles/smokeping_prober/meta/main.yml
index 80ee360e..ecda5cdb 100644
--- a/roles/smokeping_prober/meta/main.yml
+++ b/roles/smokeping_prober/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/snmp_exporter/meta/main.yml b/roles/snmp_exporter/meta/main.yml
index cc065d5b..6bbc3baf 100644
--- a/roles/snmp_exporter/meta/main.yml
+++ b/roles/snmp_exporter/meta/main.yml
@@ -21,7 +21,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"
diff --git a/roles/systemd_exporter/meta/main.yml b/roles/systemd_exporter/meta/main.yml
index c074a1cd..2ad1c62d 100644
--- a/roles/systemd_exporter/meta/main.yml
+++ b/roles/systemd_exporter/meta/main.yml
@@ -22,7 +22,6 @@ galaxy_info:
         - "9"
     - name: "Fedora"
       versions:
-        - "36"
         - "37"
   galaxy_tags:
     - "monitoring"