diff --git a/.travis.yml b/.travis.yml
index 63b6526..a255343 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,12 @@ env:
   global:
     - ROLE_NAME: ansible
   matrix:
-    - MOLECULE_DISTRO: centos7
-    - MOLECULE_DISTRO: fedora29
-    - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: debian9
+    - MOLECULE_DISTRO: centos8
+    - MOLECULE_DISTRO: fedora32
+    - MOLECULE_DISTRO: ubuntu2004
+    - MOLECULE_DISTRO: debian10
 
-    - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: centos8
       MOLECULE_PLAYBOOK: playbook-pip.yml
 
 install:
diff --git a/meta/main.yml b/meta/main.yml
index ef118f4..4ae9541 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -10,8 +10,7 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 6
-        - 7
+        - all
     - name: Fedora
       versions:
         - all
diff --git a/tasks/main.yml b/tasks/main.yml
index 3fbc2c6..5b7bbdd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,18 +9,25 @@
   when:
     - ansible_os_family == 'RedHat'
     - ansible_distribution != 'Fedora'
+    - ansible_install_method == 'package'
 
 - name: Set up Ansible on Fedora.
   include_tasks: setup-Fedora.yml
-  when: ansible_distribution == 'Fedora'
+  when:
+    - ansible_distribution == 'Fedora'
+    - ansible_install_method == 'package'
 
 - name: Set up Ansible on Ubuntu.
   include_tasks: setup-Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_install_method == 'package'
 
 - name: Set up Ansible on Debian.
   include_tasks: setup-Debian.yml
-  when: ansible_distribution == 'Debian'
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_install_method == 'package'
 
 - name: Set up Ansible using Pip.
   include_tasks: setup-pip.yml
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index b4e349f..fb6911d 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -6,11 +6,9 @@
       {{ ansible_distribution_release }}-backports main'
     state: present
     filename: "{{ ansible_distribution_release }}_backports"
+    update_cache: true
   when: ansible_distribution_version | int < 9
 
-- name: Update apt cache.
-  apt: update_cache=true cache_valid_time=86400
-
 - name: Set the default_release option for older Debian versions.
   set_fact:
     ansible_default_release: "{{ ansible_distribution_release }}-backports"
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index 2f1221d..170f243 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install Ansible.
-  yum:
+  package:
     name: ansible
     state: "{{ ansible_package_state }}"
     enablerepo: epel
diff --git a/tasks/setup-Ubuntu.yml b/tasks/setup-Ubuntu.yml
index 7fa55e3..23b972d 100644
--- a/tasks/setup-Ubuntu.yml
+++ b/tasks/setup-Ubuntu.yml
@@ -5,10 +5,9 @@
     state: present
 
 - name: Add ansible repository.
-  apt_repository: repo='ppa:ansible/ansible'
-
-- name: Update apt cache.
-  apt: update_cache=true cache_valid_time=86400
+  apt_repository:
+    repo: 'ppa:ansible/ansible'
+    update_cache: true
 
 - name: Install Ansible.
   apt: