diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 692234b..9722793 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -10,23 +10,11 @@
   tags: ntp
 
 - name: Install common packages
-  import_tasks: packages_Debian.yml
-  when: ansible_distribution == 'Debian'
-  tags: packages
-
-- name: Install common packages
-  import_tasks: packages_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+  include_tasks: packages_{{ ansible_distribution }}.yml
   tags: packages
 
 - name: Configure firewall
-  import_tasks: firewall_Debian.yml
-  when: ansible_distribution == 'Debian'
-  tags: firewall
-
-- name: Configure firewall
-  import_tasks: firewall_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+  include_tasks: firewall_{{ ansible_distribution }}.yml
   tags: firewall
 
 - name: Configure secure shell daemon