diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index e3a7ba3..148889a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -17,20 +17,10 @@
   service: name=systemd-timesyncd enabled=yes
   tags: ntp
 
-- include: packages_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+- include: packages_{{ ansible_distribution }}.yml
   tags: packages
 
-- include: packages_Debian.yml
-  when: ansible_distribution == 'Debian'
-  tags: packages
-
-- include: iptables_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
-  tags: firewall
-
-- include: iptables_Debian.yml
-  when: ansible_distribution == 'Debian'
+- include: iptables_{{ ansible_distribution }}.yml
   tags: firewall
 
 - include: sshd.yml