diff --git a/.travis.yml b/.travis.yml
index ebcbe00..044c940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,9 @@ env:
   matrix:
     - MOLECULE_DISTRO: centos8
     - MOLECULE_DISTRO: centos7
+    - MOLECULE_DISTRO: ubuntu2004
     - MOLECULE_DISTRO: ubuntu1804
-    - MOLECULE_DISTRO: ubuntu1604
+    - MOLECULE_DISTRO: debian10
     - MOLECULE_DISTRO: debian9
 
     - MOLECULE_DISTRO: centos7
diff --git a/.yamllint b/.yamllint
index a3dbc38..dff5082 100644
--- a/.yamllint
+++ b/.yamllint
@@ -4,3 +4,6 @@ rules:
   line-length:
     max: 120
     level: warning
+
+ignore: |
+  .github/stale.yml
diff --git a/defaults/main.yml b/defaults/main.yml
index e9d214b..3e2c686 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,8 +6,8 @@ php_enablerepo: ""
 # Extra packages to install (in addition to distro-specific default lists).
 php_packages_extra: []
 
-# Default PHP version to install on Debian-based OSes.
-php_default_version_debian: "7.0"
+# Default PHP version to install on Debian-based OSes (OS-specific).
+# php_default_version_debian: ""
 
 # PHP package state; use 'present' to make sure it's installed, or 'latest' if
 # you want to upgrade or switch versions using a new repo.
diff --git a/tasks/main.yml b/tasks/main.yml
index e794e8c..5dacdf6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,15 @@
 ---
 # Variable setup.
+- name: Include distribution and version-specific vars.
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+
+- name: Set the default PHP version for Debian-based OSes.
+  set_fact:
+    php_default_version_debian: "{{ __php_default_version_debian }}"
+  when: ansible_os_family == 'Debian'
+
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
diff --git a/vars/Debian-10.yml b/vars/Debian-10.yml
new file mode 100644
index 0000000..ec895ae
--- /dev/null
+++ b/vars/Debian-10.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.3"
diff --git a/vars/Debian-9.yml b/vars/Debian-9.yml
new file mode 100644
index 0000000..eb23ce3
--- /dev/null
+++ b/vars/Debian-9.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.0"
diff --git a/vars/Debian.yml b/vars/Debian.yml
index c5f90b5..c487fd8 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,4 +1,6 @@
 ---
+__php_default_version_debian: "7.0"
+
 __php_packages:
   - php{{ php_default_version_debian }}-common
   - php{{ php_default_version_debian }}-cli
diff --git a/vars/Ubuntu-16.yml b/vars/Ubuntu-16.yml
new file mode 100644
index 0000000..eb23ce3
--- /dev/null
+++ b/vars/Ubuntu-16.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.0"
diff --git a/vars/Ubuntu-18.yml b/vars/Ubuntu-18.yml
new file mode 100644
index 0000000..82230bc
--- /dev/null
+++ b/vars/Ubuntu-18.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.2"
diff --git a/vars/Ubuntu-20.yml b/vars/Ubuntu-20.yml
new file mode 100644
index 0000000..a16b99b
--- /dev/null
+++ b/vars/Ubuntu-20.yml
@@ -0,0 +1,2 @@
+---
+__php_default_version_debian: "7.4"