diff --git a/CHANGELOG.md b/CHANGELOG.md
index 849ca76..5a2b7b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
-## v1.X.Y
+## v1.3.0
 
 ### Fix
 
 * Add role_name info in meta.
 * Set a default mode (0644) in ini_file.
+* with_first_found fail when ansible_distribution vars file is missing (#5).
 
 ### Enhancement
 
@@ -19,7 +20,7 @@
 
 ### Features
 
-* Add RHEL8 support (thanks @mjourdan).
+* Add RHEL8 support (thanks @mjourdan) (#7).
 * The role also works on Debian Bullseye.
 
 ## v1.1.2
diff --git a/tasks/main.yml b/tasks/main.yml
index 2a01249..de1b90f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,8 +8,11 @@
   vars:
     params:
       files:
-        - "{{ ansible_distribution }}.yml"
-        - "{{ ansible_os_family }}.yml"
+        - '{{ ansible_distribution }}.yml'
+        - '{{ ansible_os_family }}.yml'
+      paths:
+        - 'vars'
+
 
 # Manage dependent packages [[[1
 - name: Ensure dependent packages are installed
@@ -25,12 +28,13 @@
 # Manage agent package [[[1
 
 # Specific tasks per OS will be in the include otherwise below
-- include: "{{ lookup('first_found', params) }}"
+- name: Include tasks per OS
+  include: "{{ lookup('first_found', params) }}"
   vars:
     params:
       files:
-        - "{{ ansible_distribution }}.yml"
-        - "{{ ansible_os_family }}.yml"
+        - '{{ ansible_distribution }}.yml'
+        - '{{ ansible_os_family }}.yml'
 
 - name: Ensure fusioninventory-agent package from REPOS
   package: