diff --git a/playbook_general_deploy.yml b/playbook_general_deploy.yml
index 6f71dff..ee8ad93 100644
--- a/playbook_general_deploy.yml
+++ b/playbook_general_deploy.yml
@@ -7,6 +7,7 @@
     - client_ntp
     - client_resolvers
     - client_tools
-    - users_sudo
+    - role: users_sudo
+      when: "'mail_server' not in group_names"
     - client_iptables
     - postfix