diff --git a/library/roles/postfix/tasks/postfix-relay-server.yml b/library/roles/postfix/tasks/postfix-relay-server.yml
index 4db90b72..7e9771b4 100644
--- a/library/roles/postfix/tasks/postfix-relay-server.yml
+++ b/library/roles/postfix/tasks/postfix-relay-server.yml
@@ -16,7 +16,7 @@
     action: configfile path=/etc/default/saslauthd key=START value='yes' syntax=shell
 
   when: ansible_distribution_file_variety == "Debian"
-  tags: [ 'postfix_relay', 'postfix-relay' ]
+  tags: [ 'postfix_relay', 'postfix-relay', 'postfix_sasl' ]
 
 - name: Postfix relay, rh specific
   block:
@@ -33,7 +33,7 @@
     notify: restart saslauth daemon
 
   when: ansible_distribution_file_variety == "RedHat"
-  tags: [ 'postfix_relay', 'postfix-relay' ]
+  tags: [ 'postfix_relay', 'postfix-relay', 'postfix_sasl' ]
 
 
 - name: Postfix relay
@@ -52,5 +52,5 @@
   - name: Ensure that the saslauthd daemon is started and enabled
     service: name=saslauthd state=restarted enabled=yes
   
-  tags: [ 'postfix_relay', 'postfix-relay' ]
+  tags: [ 'postfix_relay', 'postfix-relay', 'postfix_sasl' ]
 
diff --git a/library/roles/postfix/tasks/smtp-sasl-auth.yml b/library/roles/postfix/tasks/smtp-sasl-auth.yml
index 62a806e9..6089b2c4 100644
--- a/library/roles/postfix/tasks/smtp-sasl-auth.yml
+++ b/library/roles/postfix/tasks/smtp-sasl-auth.yml
@@ -3,9 +3,9 @@
   template: src=sasl_passwd.j2 dest=/etc/postfix/sasl_passwd owner=root group=root mode=0400
   when: postfix_use_sasl_auth | bool
   register: update_sasl_hash
-  tags: postfix-relay
+  tags: [ 'postfix-relay', 'postfix_relay', 'postfix_sasl_client' ]
 
 - name: Update SASL hash
   shell: postmap hash:/etc/postfix/sasl_passwd
   when: update_sasl_hash is changed
-  tags: postfix-relay
+  tags: [ 'postfix-relay', 'postfix_relay', 'postfix_sasl_client' ]