diff --git a/.travis.yml b/.travis.yml
index 8f12eba..8c1f14b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,20 @@
 env:
   - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.0,<2.1'
   - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.0,<2.1'
+  - PLATFORM='docker-debian-stretch-php72' ANSIBLE_VERSION='ansible>=2.0,<2.1'
+  - PLATFORM='docker-debian-stretch-php73' ANSIBLE_VERSION='ansible>=2.0,<2.1'
   - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.1,<2.2'
   - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.1,<2.2'
+  - PLATFORM='docker-debian-stretch-php72' ANSIBLE_VERSION='ansible>=2.1,<2.2'
+  - PLATFORM='docker-debian-stretch-php73' ANSIBLE_VERSION='ansible>=2.1,<2.2'
   - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.2,<2.3'
   - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.2,<2.3'
+  - PLATFORM='docker-debian-stretch-php72' ANSIBLE_VERSION='ansible>=2.2,<2.3'
+  - PLATFORM='docker-debian-stretch-php73' ANSIBLE_VERSION='ansible>=2.2,<2.3'
   - PLATFORM='docker-debian-stretch-php70' ANSIBLE_VERSION='ansible>=2.3,<2.4'
   - PLATFORM='docker-debian-stretch-php71' ANSIBLE_VERSION='ansible>=2.3,<2.4'
+  - PLATFORM='docker-debian-stretch-php72' ANSIBLE_VERSION='ansible>=2.3,<2.4'
+  - PLATFORM='docker-debian-stretch-php73' ANSIBLE_VERSION='ansible>=2.3,<2.4'
   - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.0,<2.1'
   - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.1,<2.2'
   - PLATFORM='docker-ubuntu-xenial-php70' ANSIBLE_VERSION='ansible>=2.2,<2.3'
diff --git a/README.md b/README.md
index 48dad1c..302c8d3 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ Install PHP (php-fpm optional) on Debian / Ubuntu. Manage APCu, Opcache, Xdebug.
 Managed OS / Versions
 ---------------------
 
-|         OS            |   PHP 7.0    |    PHP 7.1    |    PHP 7.2   |
-|:---------------------:|:------------:|:-------------:|:------------:|
-| Debian Strech (9)     | Yes          | Yes (Sury)    | Yes (Sury)   |
-| Ubuntu Xenial (16.04) | Yes          | No            | No           |
-| Ubuntu Bionic (18.04) | No           | No            | Yes          |
-| FreeBSD 11            | Yes          | Yes           | Yes          |
-| FreeBSD 12            | Yes          | Yes           | Yes          |
+|         OS            |   PHP 7.0    |    PHP 7.1    |    PHP 7.2   |    PHP 7.3   |
+|:---------------------:|:------------:|:-------------:|:------------:|:------------:|
+| Debian Stretch (9)    | Yes          | Yes (Sury)    | Yes (Sury)   | Yes (Sury)   |
+| Ubuntu Xenial (16.04) | Yes          | No            | No           | No           |
+| Ubuntu Bionic (18.04) | No           | No            | Yes          | No           |
+| FreeBSD 11            | Yes          | Yes           | Yes          | Yes          |
+| FreeBSD 12            | Yes          | Yes           | Yes          | Yes          |
 
 Links:
 - [Dotdeb](https://www.dotdeb.org)
diff --git a/Vagrantfile b/Vagrantfile
index 6696620..e2b4531 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,6 +9,7 @@ Vagrant.configure("2") do |config|
     { :name => "debian-stretch-php70", :box => "debian/stretch64", :vars => { }},
     { :name => "debian-stretch-php71", :box => "debian/stretch64", :vars => { "php_version": '7.1' }},
     { :name => "debian-stretch-php72", :box => "debian/stretch64", :vars => { "php_version": '7.2' }},
+    { :name => "debian-stretch-php73", :box => "debian/stretch64", :vars => { "php_version": '7.3' }},
     { :name => "ubuntu-xenial-php70",  :box => "ubuntu/xenial64",  :vars => { }},
     { :name => "ubuntu-bionic-php72",  :box => "ubuntu/bionic64",  :vars => { }},
   ]
@@ -22,6 +23,7 @@ Vagrant.configure("2") do |config|
     { :name => "docker-debian-stretch-php70", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { }},
     { :name => "docker-debian-stretch-php71", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.1' }},
     { :name => "docker-debian-stretch-php72", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.2' }},
+    { :name => "docker-debian-stretch-php73", :docker => "hanxhx/vagrant-ansible:debian9",     :vars => { "php_version": '7.3' }},
     { :name => "docker-ubuntu-xenial-php70",  :docker => "hanxhx/vagrant-ansible:ubuntu16.04", :vars => { }},
     { :name => "docker-ubuntu-bionic-php72",  :docker => "hanxhx/vagrant-ansible:ubuntu18.04", :vars => { }},
   ]
@@ -62,6 +64,7 @@ Vagrant.configure("2") do |config|
   end
 
   vms_freebsd.each do |opts|
+    config.vm.synced_folder ".", "/vagrant", disabled: true
     config.vm.base_mac = "080027D14C66"
     config.vm.define opts[:name] do |m|
       m.vm.box = opts[:box]
diff --git a/tasks/main.yml b/tasks/main.yml
index 7fc665b..cf4f2ab 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,7 +4,11 @@
   include_vars: "OS_Family_{{ ansible_os_family }}.yml"
 
 - name: INCLUDE_VARS | Related to OS version
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
 
 - name: APT | Install PHP packages
   apt:
diff --git a/tests/includes/pre_FreeBSD.yml b/tests/includes/pre_FreeBSD.yml
index 5630871..7237f11 100644
--- a/tests/includes/pre_FreeBSD.yml
+++ b/tests/includes/pre_FreeBSD.yml
@@ -3,7 +3,7 @@
 - name: SET_FACT | Prepare test vars
   set_fact:
     __nginx_conf: /usr/local/etc/nginx/nginx.conf
-    php_xdebug_package: 'php72-pecl-xdebug26'
+    php_xdebug_package: 'php72-pecl-xdebug-2.6.1'
 
 - name: PKGNG | Install packages
   pkgng:
diff --git a/vars/FreeBSD-12.0-CURRENT.yml b/vars/FreeBSD-11.yml
similarity index 100%
rename from vars/FreeBSD-12.0-CURRENT.yml
rename to vars/FreeBSD-11.yml
diff --git a/vars/FreeBSD-12.yml b/vars/FreeBSD-12.yml
new file mode 100644
index 0000000..ebebaae
--- /dev/null
+++ b/vars/FreeBSD-12.yml
@@ -0,0 +1 @@
+php_default_version: '7.2'