diff --git a/tasks/debian.yml b/tasks/debian.yml
deleted file mode 100644
index 0cb09f7..0000000
--- a/tasks/debian.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-- name: debian packages installed
-  apt:
-    pkg: "{{item}}"
-  with_items:
-    - debootstrap
diff --git a/tasks/main.yml b/tasks/main.yaml
similarity index 78%
rename from tasks/main.yml
rename to tasks/main.yaml
index b017281..816f36c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yaml
@@ -1,10 +1,6 @@
 ---
 
-- include: debian.yml
-  when: ansible_os_family == "Debian"
-
-- include: gentoo.yml
-  when: ansible_os_family == "Gentoo"
+- include: setup_{{ansible_os_family}}.yaml
 
 #- name: debootstrap download
 #  command:
diff --git a/tasks/setup_Debian.yaml b/tasks/setup_Debian.yaml
new file mode 100644
index 0000000..2f8215d
--- /dev/null
+++ b/tasks/setup_Debian.yaml
@@ -0,0 +1,6 @@
+---
+
+- name: debian packages installed
+  apt:
+    pkg:
+      - debootstrap
diff --git a/tasks/gentoo.yml b/tasks/setup_Gentoo.yaml
similarity index 100%
rename from tasks/gentoo.yml
rename to tasks/setup_Gentoo.yaml