diff --git a/.ansible/roles/desktop/tasks/homebrew.yaml b/.ansible/roles/desktop/tasks/darwin/homebrew.yaml
similarity index 100%
rename from .ansible/roles/desktop/tasks/homebrew.yaml
rename to .ansible/roles/desktop/tasks/darwin/homebrew.yaml
diff --git a/.ansible/roles/desktop/tasks/mas.yaml b/.ansible/roles/desktop/tasks/darwin/mas.yaml
similarity index 100%
rename from .ansible/roles/desktop/tasks/mas.yaml
rename to .ansible/roles/desktop/tasks/darwin/mas.yaml
diff --git a/.ansible/roles/desktop/tasks/prefs.yaml b/.ansible/roles/desktop/tasks/darwin/prefs.yaml
similarity index 100%
rename from .ansible/roles/desktop/tasks/prefs.yaml
rename to .ansible/roles/desktop/tasks/darwin/prefs.yaml
diff --git a/.ansible/roles/desktop/tasks/config.yaml b/.ansible/roles/desktop/tasks/linux/config.yaml
similarity index 100%
rename from .ansible/roles/desktop/tasks/config.yaml
rename to .ansible/roles/desktop/tasks/linux/config.yaml
diff --git a/.ansible/roles/desktop/tasks/software.yaml b/.ansible/roles/desktop/tasks/linux/software.yaml
similarity index 100%
rename from .ansible/roles/desktop/tasks/software.yaml
rename to .ansible/roles/desktop/tasks/linux/software.yaml
diff --git a/.ansible/roles/desktop/tasks/main.yaml b/.ansible/roles/desktop/tasks/main.yaml
index d143070..20f1ec0 100644
--- a/.ansible/roles/desktop/tasks/main.yaml
+++ b/.ansible/roles/desktop/tasks/main.yaml
@@ -1,15 +1,15 @@
-- name: Common desktop tasks
-  import_tasks: firefox.yaml
-
 - name: Linux desktop tasks
   block:
-  - import_tasks: software.yaml
-  - import_tasks: config.yaml
+  - import_tasks: linux/software.yaml
+  - import_tasks: linux/config.yaml
   when: ansible_system == 'Linux'
 
 - name: OS X desktop tasks
   block:
-  - import_tasks: homebrew.yaml
-  - import_tasks: mas.yaml
-  - import_tasks: prefs.yaml
+  - import_tasks: darwin/homebrew.yaml
+  - import_tasks: darwin/mas.yaml
+  - import_tasks: darwin/prefs.yaml
   when: ansible_system == 'Darwin'
+
+- name: Common desktop tasks
+  import_tasks: firefox.yaml