diff --git a/tasks/main.yml b/tasks/main.yml
index 875d6a0..956a466 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,9 +3,22 @@
   with_first_found:
     - "os_{{ ansible_os_family | lower }}.yml"
 
-- include_tasks: setup_default.yml
-  when: not ansible_lsb.id is defined or not ansible_lsb.id == "Univention"
-- include_tasks: setup_ucs.yml
-  when:
-    - ansible_lsb.id is defined
-    - ansible_lsb.id == "Univention"
+- include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_lsb.id | default('') | lower }}.yml"
+        - "{{ ansible_os_family | lower }}.yml"
+      paths:
+        - "vars"
+      errors: "ignore"
+
+- include_tasks: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "setup_{{ ansible_lsb.id | default('') | lower }}.yml"
+        - "setup_{{ ansible_os_family | lower }}.yml"
+        - "setup_default.yml"
+      paths:
+        - "tasks"
diff --git a/tasks/setup_ucs.yml b/tasks/setup_univention.yml
similarity index 100%
rename from tasks/setup_ucs.yml
rename to tasks/setup_univention.yml
diff --git a/vars/os_debian.yml b/vars/debian.yml
similarity index 100%
rename from vars/os_debian.yml
rename to vars/debian.yml
diff --git a/vars/os_redhat.yml b/vars/redhat.yml
similarity index 100%
rename from vars/os_redhat.yml
rename to vars/redhat.yml