diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index bbcb59e..d3430ed 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -19,7 +19,6 @@ jobs:
       - name: molecule
         uses: robertdebock/molecule-action@1.1.3
         with:
-          image: ${{ matrix.image }}
           entrypoint: /usr/local/bin/molecule
           args: lint
   test:
@@ -27,83 +26,35 @@ jobs:
       - lint
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        image:
-          - amazonlinux
-          - alpine
-          - debian
-          - fedora
-          - centos
-          - opensuse
-          - ubuntu
-        tag:
-          - 1
-          - 7
-          - edge
-          - latest
-          - rawhide
-          - unstable
-        exclude:
-          - image: alpine
-            tag: 1
-          - image: alpine
-            tag: 7
-          - image: alpine
-            tag: rawhide
-          - image: alpine
-            tag: unstable
-          - image: amazonlinux
-            tag: 7
-          - image: amazonlinux
-            tag: edge
-          - image: amazonlinux
-            tag: rawhide
-          - image: amazonlinux
-            tag: unstable
-          - image: debian
-            tag: 1
-          - image: debian
-            tag: 7
-          - image: debian
-            tag: edge
-          - image: debian
-            tag: rawhide
-          - image: centos
-            tag: 1
-          - image: centos
-            tag: edge
-          - image: centos
-            tag: rawhide
-          - image: centos
-            tag: unstable
-          - image: fedora
-            tag: 1
-          - image: fedora
-            tag: 7
-          - image: fedora
-            tag: edge
-          - image: fedora
-            tag: unstable
-          - image: opensuse
-            tag: 1
-          - image: opensuse
-            tag: 7
-          - image: opensuse
-            tag: edge
-          - image: opensuse
-            tag: rawhide
-          - image: opensuse
-            tag: unstable
-          - image: ubuntu
-            tag: 1
-          - image: ubuntu
-            tag: 7
-          - image: ubuntu
-            tag: edge
-          - image: ubuntu
-            tag: rawhide
-          - image: ubuntu
-            tag: unstable
+        config:
+          - image: "amazonlinux"
+            tag: "1"
+          - image: "amazonlinux"
+            tag: "latest"
+          - image: "alpine"
+            tag: "latest"
+          - image: "alpine"
+            tag: "edge"
+          - image: "debian"
+            tag: "latest"
+          - image: "debian"
+            tag: "unstable"
+          - image: "fedora"
+            tag: "30"
+          - image: "fedora"
+            tag: "latest"
+          - image: "fedora"
+            tag: "rawhide"
+          - image: "centos"
+            tag: "7"
+          - image: "centos"
+            tag: "latest"
+          - image: "opensuse"
+            tag: "latest"
+          - image: "ubuntu"
+            tag: "latest"
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -116,5 +67,5 @@ jobs:
       - name: molecule
         uses: robertdebock/molecule-action@1.1.3
         with:
-          image: ${{ matrix.image }}
-          options: "--parallel all"
+          image: ${{ matrix.config.image }}
+          tag: ${{ matrix.config.tag }}
diff --git a/.travis.yml b/.travis.yml
index ed3c86c..ede0d55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,25 +15,18 @@ env:
     namespace="robertdebock"
   matrix:
     - image="amazonlinux" tag="1"
-    - image="amazonlinux"
-    - image="alpine"
+    - image="amazonlinux" tag="latest"
+    - image="alpine" tag="latest"
     - image="alpine" tag="edge"
+    - image="debian" tag="latest"
     - image="debian" tag="unstable"
-    - image="debian"
-    - image="fedora"
+    - image="fedora" tag="30"
+    - image="fedora" tag="latest"
     - image="fedora" tag="rawhide"
     - image="centos" tag="7"
-    - image="redhat" tag="7"
-    - image="centos"
-    - image="redhat"
-    - image="opensuse"
-    - image="ubuntu"
-
-matrix:
-  allow_failures:
-    - env: image="alpine" tag="edge"
-    - env: image="debian" tag="unstable"
-    - env: image="fedora" tag="rawhide"
+    - image="centos" tag="latest"
+    - image="opensuse" tag="latest"
+    - image="ubuntu" tag="latest"
 
 cache:
   - pip
@@ -43,7 +36,7 @@ install:
   - pip install tox
 
 script:
-  - tox --parallel all
+  - tox
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/README.md b/README.md
index e827f1d..4f227cd 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ This role has been tested on these [container images](https://hub.docker.com/):
 |fedora|all|
 |el|7, 8|
 |opensuse|all|
-|ubuntu|artful, bionic|
+|ubuntu|bionic|
 
 The minimum version of Ansible required is 2.8 but tests have been done to:
 
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 62412dd..7ffb9c7 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -23,6 +23,6 @@ provisioner:
   config_options:
     defaults:
       stdout_callback: yaml
-      bin_ansible_callbacks: true
+      bin_ansible_callbacks: yes
 scenario:
   name: default