diff --git a/tasks/apt.yml b/tasks/apt.yml
index e974560..3b51b2e 100644
--- a/tasks/apt.yml
+++ b/tasks/apt.yml
@@ -1,25 +1,20 @@
 ---
 - name: apt - add apt keys
   apt_key: id="{{ item.id }}" url="{{ item.url }}" file="{{ item.file }}" state="{{ item.state }}"
-  tags: ['common', 'apt']
   with_items: "{{ common_apt_keys }}"
 
 - name: apt - add repositories
   apt_repository: repo="{{ item }}" update_cache=yes
   with_items: "{{ common_apt_repositories }}"
-  tags: ['common', 'apt']
 
 - name: apt - remove /etc/apt/sources.list
   file: path=/etc/apt/sources.list state=absent
   notify: apt-get update
-  tags: ['common', 'apt'] 
 
 - name: install basic tools
   apt: pkg="{{ item }}" cache_valid_time=3600 update_cache=yes
   with_items: "{{ common_basic_packages }}"
-  tags: common
 
 #- name: apt - upgrade system
 #  apt: upgrade="{{ common_apt_upgrade_policy }}"
 #  when: common_apt_upgrade_policy
-#  tags: ['common', 'apt']
diff --git a/tasks/locales.yml b/tasks/locales.yml
index eb5127d..7f10bf1 100644
--- a/tasks/locales.yml
+++ b/tasks/locales.yml
@@ -3,9 +3,7 @@
 - name: set locales
   locale_gen: name="{{ item.name }}" state="{{ item.state | default('present') }}"
   with_items: "{{ common_locales }}"
-  tags: ['common', 'locales']
 
 - name: set default locale
   lineinfile: dest="/etc/default/locale" regexp="LANG=" line="LANG={{ common_locales_default }}"
   when: common_locales_default
-  tags: ['common', 'locales']
diff --git a/tasks/main.yml b/tasks/main.yml
index d2cb19a..120ae4b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,14 @@
 ---
 
 - include: resolvconf.yml
+  tags: ['common', 'resolvconf']
 
 - include: hostname.yml
   when: common_hostname
   tags: ['common', 'hostname']
 
 - include: apt.yml
+  tags: ['common', 'apt']
 
 - include: locales.yml
   when: common_locales
@@ -26,7 +28,7 @@
   copy: dest=/etc/mailname content="{{ common_mailname }}\n" owner=root group=root mode=0644
   notify: restart mailer
   when: common_mailer != False
-  tags: common
+  tags: ['common', 'mailer']
 
 - name: /etc/aliases
   template: dest=/etc/aliases src=aliases.j2 owner=root group=root mode=0644
@@ -34,10 +36,13 @@
     - newaliases
     - restart mailer
   when: common_mailer != False
-  tags: common
+  tags: ['common', 'mailer']
 
 - include: ntp.yml
+  tags: ['common', 'ntp']
+
 - include: openssh.yml
+  tags: ['common', 'openssh']
 
 - include: rsyslog.yml
   when: common_rsyslog
@@ -45,3 +50,4 @@
 
 - include: "{{ common_mailer }}.yml"
   when: common_mailer != False
+  tags: ['common', 'mailer']
diff --git a/tasks/ntp.yml b/tasks/ntp.yml
index a14cb18..c38ff58 100644
--- a/tasks/ntp.yml
+++ b/tasks/ntp.yml
@@ -3,9 +3,7 @@
 - name: ntp - install
   apt: name=ntp
   when: ansible_virtualization_type != 'lxc' or ansible_virtualization_role == 'host'
-  tags: ['common', 'ntp']
 
 - name: ntp - run and enable
   service: name=ntp state=started enabled=yes
   when: ansible_virtualization_type != 'lxc' or ansible_virtualization_role == 'host'
-  tags: ['common', 'ntp'] 
diff --git a/tasks/openssh.yml b/tasks/openssh.yml
index 3d8e691..613f0f4 100644
--- a/tasks/openssh.yml
+++ b/tasks/openssh.yml
@@ -2,18 +2,15 @@
 
 - name: openssh - install
   apt: name=openssh-server
-  tags: ['common', 'openssh']
 
 - name: openssh - start and enable
   service: name=ssh state=running enabled=yes
-  tags: ['common', 'openssh']
 
 - name: openssh - config
   template: dest=/etc/ssh/sshd_config src=sshd_config.j2 owner=root group=root mode=0600
   notify: reload openssh
-  tags: ['common', 'openssh']
 
 - name: openssh - root keys
   authorized_key: user="root" key="{{ common_openssh_keys_root | join("\n") }}" exclusive=yes
   when: common_openssh_keys_root
-  tags: ['common', 'openssh', 'ssh-keys']
+  tags: 'ssh-keys'
diff --git a/tasks/postfix.yml b/tasks/postfix.yml
index e6241dd..b5fb286 100644
--- a/tasks/postfix.yml
+++ b/tasks/postfix.yml
@@ -2,7 +2,6 @@
 
 - name: install postfix
   apt: name="postfix" state=present
-  tags: ['common', 'postfix']
 
 - name: postfix config
   template: dest="/etc/postfix/{{ item }}" src="postfix/{{ item }}.j2" owner=root group=root mode=0644
@@ -10,8 +9,6 @@
     - main.cf
     - master.cf
   notify: restart mailer
-  tags: ['common', 'postfix']
 
 - name: postfix - start and enable
   service: name=postfix state=started enabled=yes
-  tags: ['common', 'postfix']
diff --git a/tasks/resolvconf.yml b/tasks/resolvconf.yml
index dbc8309..4802515 100644
--- a/tasks/resolvconf.yml
+++ b/tasks/resolvconf.yml
@@ -2,15 +2,11 @@
 
 - name: resolvconf - install
   apt: name=resolvconf state=present
-  tags: ['common', 'resolvconf'] 
 
 - name: resolvconf - tail file
   template: dest=/etc/resolvconf/resolv.conf.d/tail src=resolvconf_tail.j2 owner=root group=root mode=0644
   when: common_resolvconf_nameservers
   notify: restart resolvconf
-  tags: ['common', 'resolvconf'] 
 
 - name: resolvconf - start and enable
   service: name=resolvconf state=started enabled=yes
-  tags: ['common', 'resolvconf'] 
-
diff --git a/tasks/rsyslog.yml b/tasks/rsyslog.yml
index 74aeaef..723e357 100644
--- a/tasks/rsyslog.yml
+++ b/tasks/rsyslog.yml
@@ -2,24 +2,19 @@
 
 - name: rsyslog - install
   apt: name=rsyslog
-  tags: ['common', 'rsyslog']
 
 - name: rsyslog - rsyslog.conf
   template: dest=/etc/rsyslog.conf src=rsyslog.conf.j2 owner=root group=root mode=0644
   notify: restart rsyslog
-  tags: ['common', 'rsyslog']
 
 - name: rsyslog - rsyslog.d
   file: path=/etc/rsyslog.d state=directory owner=root group=root mode=0755
   notify: restart rsyslog
-  tags: ['common', 'rsyslog']
 
 - name: rsyslog - syslog forwarding client.conf
   template: dest=/etc/rsyslog.d/forwards.conf src=rsyslog_forwards.conf.j2 owner=root group=root mode=0644
   when: common_rsyslog_forwards
   notify: restart rsyslog
-  tags: ['common', 'rsyslog']
 
 - name: rsyslog - start and enable
   service: name=rsyslog state=started enabled=yes
-  tags: ['common', 'rsyslog']