diff --git a/tasks/bootstrap.yml b/tasks/bootstrap.yml
index 8e87d650d69f2347897381065e4dbc5fd8d51a0b..a840b3fa9fecfd73592446bc4ae8d1bed617ab78 100644
--- a/tasks/bootstrap.yml
+++ b/tasks/bootstrap.yml
@@ -19,12 +19,13 @@
     - name: Gather OS specific vars
       include_vars: '{{ item }}'
       with_first_found:
-        - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
-        - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
-        - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
-        - vars/{{ ansible_distribution | lower }}.yml
-        - vars/{{ ansible_os_family | lower }}.yml
-        - defaults/main.yml
+        - files:
+            - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
+            - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
+            - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
+            - vars/{{ ansible_distribution | lower }}.yml
+            - vars/{{ ansible_os_family | lower }}.yml
+          skip: true
 
     - include_tasks: '{{ item }}'
       with_first_found:
@@ -35,4 +36,4 @@
         - tasks/bootstrap_{{ ansible_os_family | lower }}.yml
   tags: bootstrap
 ...
-# vi: set ts=2 sts=2 sw=2 et ft=yaml: 
+# vi: set ts=2 sts=2 sw=2 et ft=yaml: