diff --git a/playbooks/roles/base-server/tasks/main.yaml b/playbooks/roles/base-server/tasks/main.yaml
index 4d7f669245..d305d4f9d9 100644
--- a/playbooks/roles/base-server/tasks/main.yaml
+++ b/playbooks/roles/base-server/tasks/main.yaml
@@ -5,12 +5,13 @@
   loop: '{{ base_packages }}'
 
 - name: Include OS-specific variables
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_facts.distribution }}.{{ ansible_facts.architecture }}.yaml"
-    - "{{ ansible_facts.distribution }}.yaml"
-    - "{{ ansible_facts.os_family }}.yaml"
-    - "default.yaml"
+  include_vars: "{{ lookup('first_found', file_list) }}"
+  vars:
+    file_list:
+      - "{{ ansible_facts.distribution }}.{{ ansible_facts.architecture }}.yaml"
+      - "{{ ansible_facts.distribution }}.yaml"
+      - "{{ ansible_facts.os_family }}.yaml"
+      - "default.yaml"
 
 - name: Install distro specific packages
   package:
@@ -54,7 +55,6 @@
 
 - name: Include OS-specific tasks
   include_tasks: "{{ lookup('first_found', file_list) }}"
-  static: no
   vars:
     file_list:
       - "{{ ansible_facts.distribution }}.{{ ansible_facts.lsb.codename }}.{{ ansible_facts.architecture }}.yaml"
diff --git a/playbooks/roles/exim/tasks/main.yaml b/playbooks/roles/exim/tasks/main.yaml
index a91cfb55e6..c3d6a43935 100644
--- a/playbooks/roles/exim/tasks/main.yaml
+++ b/playbooks/roles/exim/tasks/main.yaml
@@ -1,16 +1,17 @@
 - name: Include OS-specific variables
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_facts.distribution }}.{{ ansible_facts.architecture }}.yaml"
-    - "{{ ansible_facts.distribution }}.yaml"
-    - "{{ ansible_facts.os_family }}.yaml"
-    - "default.yaml"
+  include_vars: "{{ lookup('first_found', file_list) }}"
+  vars:
+    file_list:
+      - "{{ ansible_facts.distribution }}.{{ ansible_facts.architecture }}.yaml"
+      - "{{ ansible_facts.distribution }}.yaml"
+      - "{{ ansible_facts.os_family }}.yaml"
+      - "default.yaml"
 
 - name: Include OS-specific tasks
-  include_tasks: "{{ item }}"
-  static: no
-  with_first_found:
-    - files:
+  include_tasks: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
         - "{{ ansible_facts.distribution }}.{{ ansible_facts.lsb.codename }}.{{ ansible_facts.architecture }}.yaml"
         - "{{ ansible_facts.distribution }}.{{ ansible_facts.architecture }}.yaml"
         - "{{ ansible_facts.distribution }}.yaml"