diff --git a/molecule/framework-dependent/molecule/default/molecule.yml b/molecule/framework-dependent/molecule/default/molecule.yml
index 4c21312..193b70d 100644
--- a/molecule/framework-dependent/molecule/default/molecule.yml
+++ b/molecule/framework-dependent/molecule/default/molecule.yml
@@ -26,12 +26,18 @@ platforms:
     image: debian:9
   - name: debian.10
     image: debian:10
-  - name: fedora.29
-    image: fedora:29
-  - name: fedora.30
-    image: fedora:30
+  - name: fedora.31
+    image: fedora:31
+  - name: fedora.32
+    image: fedora:32
   - name: centos.7
     image: centos:7
+  - name: centos.8
+    image: centos:8
+  - name: ol.7
+    image: oraclelinux:7
+  - name: ol.8
+    image: oraclelinux:8
   - name: opensuse.15.0
     image: opensuse/leap:15.0
 provisioner:
diff --git a/molecule/self-contained/molecule/default/molecule.yml b/molecule/self-contained/molecule/default/molecule.yml
index 5b767dd..8744360 100644
--- a/molecule/self-contained/molecule/default/molecule.yml
+++ b/molecule/self-contained/molecule/default/molecule.yml
@@ -29,6 +29,22 @@ platforms:
   #   image: opensuse/leap:15.1
   # - name: opensuse.15.2
   #   image: opensuse/leap:15.2
+  - name: ubuntu.16.04
+    image: ubuntu:16.04
+  - name: ubuntu.18.04
+    image: ubuntu:18.04
+  - name: ubuntu.19.10
+    image: ubuntu:19.10
+  - name: ubuntu.20.04
+    image: ubuntu:20.04
+  - name: debian.9
+    image: debian:9
+  - name: debian.10
+    image: debian:10
+  - name: fedora.31
+    image: fedora:31
+  - name: fedora.32
+    image: fedora:32
   - name: centos.7
     image: centos:7
   - name: centos.8
@@ -37,24 +53,8 @@ platforms:
     image: oraclelinux:7
   - name: ol.8
     image: oraclelinux:8
-  - name: fedora.30
-    image: fedora:30
-  - name: fedora.29
-    image: fedora:29
-  - name: debian.8
-    image: debian:8
-  - name: debian.9
-    image: debian:9
-  - name: debian.10
-    image: debian:10
-  - name: ubuntu.14.04
-    image: ubuntu:14.04
-  - name: ubuntu.16.04
-    image: ubuntu:16.04
-  - name: ubuntu.18.04
-    image: ubuntu:18.04
-  - name: ubuntu.19.10
-    image: ubuntu:19.10
+  - name: opensuse.15.0
+    image: opensuse/leap:15.0
 
 provisioner:
   name: ansible