diff --git a/roles/bootstrap_os/tasks/main.yml b/roles/bootstrap_os/tasks/main.yml
index 71620a461..5625e8fa3 100644
--- a/roles/bootstrap_os/tasks/main.yml
+++ b/roles/bootstrap_os/tasks/main.yml
@@ -16,8 +16,7 @@
     tags:
     - facts
     with_first_found:
-    - &search
-      files:
+    - files: &search_files
       - "{{ os_release_dict['ID'] }}-{{ os_release_dict['VARIANT_ID'] }}.yml"
       - "{{ os_release_dict['ID'] }}.yml"
       paths:
@@ -26,8 +25,8 @@
   - name: Include tasks
     include_tasks: "{{ included_tasks_file }}"
     with_first_found:
-    - <<: *search
-      paths: []
+    - files: *search_files
+      skip: true
     loop_control:
       loop_var: included_tasks_file