diff --git a/tasks/devel.yml b/tasks/devel.yml
index a942f1c..a6fc5e3 100644
--- a/tasks/devel.yml
+++ b/tasks/devel.yml
@@ -16,12 +16,14 @@
 - name: VSCode - Install and configure VS Code
   tags: vscode
   ansible.builtin.include_tasks:
-    file: "{{ item }}"
+    file: "{{ with_first_found_item }}"
     apply:
       tags: vscode
   with_first_found:
     - "devel-{{ ansible_facts['distribution'] }}.yml"
     - "devel-{{ (override_os_family is defined) | ternary(override_os_family, ansible_facts['os_family']) }}.yml"
+  loop_control:
+    loop_var: with_first_found_item
 
 # Install Visual Studio Code and Set Basic Configuration
 - name: VSCode - Basics
diff --git a/tasks/essentials.yml b/tasks/essentials.yml
index 6a473eb..c3ca4f1 100644
--- a/tasks/essentials.yml
+++ b/tasks/essentials.yml
@@ -2,7 +2,9 @@
 # Common/Essentials: Essential Utilities (git, curl; vim, tmux, zsh, pip)
 
 - name: Essentials - Install essential utilities
-  ansible.builtin.include_tasks: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ with_first_found_item }}"
   with_first_found:
     - "essentials-{{ ansible_facts['distribution'] }}.yml"
     - "essentials-{{ (override_os_family is defined) | ternary(override_os_family, ansible_facts['os_family']) }}.yml"
+  loop_control:
+    loop_var: with_first_found_item
diff --git a/tasks/tools.yml b/tasks/tools.yml
index e74d282..8b9bddd 100644
--- a/tasks/tools.yml
+++ b/tasks/tools.yml
@@ -2,7 +2,9 @@
 # Common/Tools: Additional Tools (depending on OS) (rsync; dnsutils, htop, unzip)
 
 - name: Tools - Install basic utilities
-  ansible.builtin.include_tasks: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ with_first_found_item }}"
   with_first_found:
     - "tools-{{ ansible_facts['distribution'] }}.yml"
     - "tools-{{ (override_os_family is defined) | ternary(override_os_family, ansible_facts['os_family']) }}.yml"
+  loop_control:
+    loop_var: with_first_found_item
diff --git a/tasks/update.yml b/tasks/update.yml
index 6589075..b6d44a5 100644
--- a/tasks/update.yml
+++ b/tasks/update.yml
@@ -2,8 +2,10 @@
 # Common/Update: Install All Updates
 
 - name: Update - Update and upgrade all packages
-  ansible.builtin.include_tasks: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ with_first_found_item }}"
   with_first_found:
     - "update-{{ ansible_facts['distribution'] }}.yml"
     - "update-{{ (override_os_family is defined) | ternary(override_os_family, ansible_facts['os_family']) }}.yml"
+  loop_control:
+    loop_var: with_first_found_item
   ignore_errors: true
diff --git a/tasks/usersetup.yml b/tasks/usersetup.yml
index be99d1f..653ba89 100644
--- a/tasks/usersetup.yml
+++ b/tasks/usersetup.yml
@@ -3,7 +3,9 @@
 # Will run once per user, because of lockfile `~/.ansbl-common-usersetup`
 
 - name: Usersetup - Run setup tasks
-  ansible.builtin.include_tasks: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ with_first_found_item }}"
   with_first_found:
     - "usersetup-{{ ansible_facts['distribution'] }}.yml"
     - "usersetup-{{ (override_os_family is defined) | ternary(override_os_family, ansible_facts['os_family']) }}.yml"
+  loop_control:
+    loop_var: with_first_found_item
diff --git a/tasks/usertools.yml b/tasks/usertools.yml
index b63b423..2589355 100644
--- a/tasks/usertools.yml
+++ b/tasks/usertools.yml
@@ -2,7 +2,9 @@
 # Common/Usertools: User's Main Machine/ Developer Tools (nmap, rsync, icdiff, iftop, ansible)
 
 - name: Usertools - Install user's working utilities
-  ansible.builtin.include_tasks: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ with_first_found_item }}"
   with_first_found:
     - "usertools-{{ ansible_facts['distribution'] }}.yml"
     - "usertools-{{ (override_os_family is defined) | ternary(override_os_family, ansible_facts['os_family']) }}.yml"
+  loop_control:
+    loop_var: with_first_found_item