diff --git a/playbooks/roles/base-repos/tasks/main.yaml b/playbooks/roles/base-repos/tasks/main.yaml
index ca15dce871..7662da1fe0 100644
--- a/playbooks/roles/base-repos/tasks/main.yaml
+++ b/playbooks/roles/base-repos/tasks/main.yaml
@@ -5,5 +5,4 @@
       files:
         - "{{ ansible_facts.distribution }}.yaml"
         - "{{ ansible_facts.os_family }}.yaml"
-      skip: true
-  loop: "{{ query('first_found', params) }}"
+  loop: "{{ query('first_found', params, errors='ignore') }}"
diff --git a/playbooks/roles/disable-puppet-agent/tasks/main.yaml b/playbooks/roles/disable-puppet-agent/tasks/main.yaml
index c6c9a71b1e..2cbf884bb8 100644
--- a/playbooks/roles/disable-puppet-agent/tasks/main.yaml
+++ b/playbooks/roles/disable-puppet-agent/tasks/main.yaml
@@ -3,8 +3,7 @@
   vars:
     params:
       files: "{{ distro_lookup_path }}"
-      skip: true
-  loop: "{{ query('first_found', params) }}"
+  loop: "{{ query('first_found', params, errors='ignore') }}"
 
 - name: Disable the puppet service
   service:
diff --git a/playbooks/roles/iptables/tasks/main.yaml b/playbooks/roles/iptables/tasks/main.yaml
index 314d6adacf..64925e09ea 100644
--- a/playbooks/roles/iptables/tasks/main.yaml
+++ b/playbooks/roles/iptables/tasks/main.yaml
@@ -43,8 +43,7 @@
   vars:
     params:
       files: "{{ distro_lookup_path }}"
-      skip: true
-  loop: "{{ query('first_found', params) }}"
+  loop: "{{ query('first_found', params, errors='ignore') }}"
 
 - name: Enable iptables service
   service:
diff --git a/playbooks/roles/unbound/tasks/main.yaml b/playbooks/roles/unbound/tasks/main.yaml
index 1d6b708ce2..c3e4ad7ff6 100644
--- a/playbooks/roles/unbound/tasks/main.yaml
+++ b/playbooks/roles/unbound/tasks/main.yaml
@@ -3,8 +3,7 @@
   vars:
     params:
       files: "{{ distro_lookup_path }}"
-      skip: true
-  loop: "{{ query('first_found', params) }}"
+  loop: "{{ query('first_found', params, errors='ignore') }}"
 
 - name: Install unbound
   package:
diff --git a/roles/exim/tasks/main.yaml b/roles/exim/tasks/main.yaml
index ca983253bc..0ba366a450 100644
--- a/roles/exim/tasks/main.yaml
+++ b/roles/exim/tasks/main.yaml
@@ -11,8 +11,7 @@
   vars:
     params:
       files: "{{ distro_lookup_path }}"
-      skip: true
-  loop: "{{ query('first_found', params) }}"
+  loop: "{{ query('first_found', params, errors='ignore') }}"
 
 - name: Write Exim defaults file
   template: