diff --git a/roles/common/tasks/Debian.yml b/roles/common/tasks/Debian.yml
index d2f8427..1ccf468 100644
--- a/roles/common/tasks/Debian.yml
+++ b/roles/common/tasks/Debian.yml
@@ -6,8 +6,8 @@
 
 - name: Configure snmpd
   template: src=snmpd.conf.j2 dest=/etc/snmp/snmpd.conf
-  tags: snmp
   notify: restart snmpd
+  tags: snmp
 
 - name: Start the snmpd service
   service: name=snmpd state=started enabled=yes
diff --git a/roles/common/tasks/FreeBSD.yml b/roles/common/tasks/FreeBSD.yml
index 3b78a92..fd55731 100644
--- a/roles/common/tasks/FreeBSD.yml
+++ b/roles/common/tasks/FreeBSD.yml
@@ -6,8 +6,8 @@
 
 - name: Configure snmpd
   template: src=snmpd.conf.j2 dest=/usr/local/etc/snmpd.conf
-  tags: snmp
   notify: restart snmpd
+  tags: snmp
 
 - name: Start the snmpd service
   service: name=snmpd state=started enabled=yes
diff --git a/roles/ldap-client/tasks/main.yml b/roles/ldap-client/tasks/main.yml
index 19e6d92..97aeb2f 100644
--- a/roles/ldap-client/tasks/main.yml
+++ b/roles/ldap-client/tasks/main.yml
@@ -2,18 +2,23 @@
 
 - name: Install nslcd
   apt: name=nslcd state=present
+  tags: ldap
 
 - name: Configure nslcd
   template: src=nslcd.conf.j2 dest=/etc/nslcd.conf
   notify: restart nslcd
+  tags: ldap
 
 - name: Copy LDAP CA
   copy: src=ldap.crt dest=/etc/ldap/ldap.crt mode=0644
   notify: restart nslcd
+  tags: ldap
 
 - name: Configure PAM mkhomedir
   copy: src=mkhomedir dest=/usr/share/pam-configs/mkhomedir mode=0644
   notify: update pam-auth
+  tags: ldap
 
 - name: Start the nslcd service
   service: name=nslcd state=started enabled=yes
+  tags: ldap
diff --git a/roles/ntp/tasks/Debian.yml b/roles/ntp/tasks/Debian.yml
index b113021..9850550 100644
--- a/roles/ntp/tasks/Debian.yml
+++ b/roles/ntp/tasks/Debian.yml
@@ -2,10 +2,13 @@
 
 - name: Install ntp
   apt: name=ntp state=present
+  tags: ntp
 
 - name: Configure ntp
   template: src=ntp.conf.j2 dest=/etc/ntp.conf
   notify: Restart ntp
+  tags: ntp
 
 - name: Start the ntp service
   service: name=ntp state=started enabled=yes
+  tags: ntp
diff --git a/roles/ntp/tasks/FreeBSD.yml b/roles/ntp/tasks/FreeBSD.yml
index 2032859..6b0652b 100644
--- a/roles/ntp/tasks/FreeBSD.yml
+++ b/roles/ntp/tasks/FreeBSD.yml
@@ -5,6 +5,8 @@
 - name: Configure ntp
   template: src=ntp.conf.j2 dest=/etc/ntp.conf
   notify: Restart ntp
+  tags: ntp
 
 - name: Start the ntp service
   service: name=ntpd state=started enabled=yes
+  tags: ntp