diff --git a/host_vars/webserver b/host_vars/webserver
index 66592b4d0a33fee21d0db249ca651f407342f0b2..574a58f66cfc9d4bb708a4267aec810948f995f4 100644
--- a/host_vars/webserver
+++ b/host_vars/webserver
@@ -87,27 +87,20 @@ alert:
     - { name: "keycloak_sync-group-active_1" }
     - { name: "ldap_openldap_1" }
     - { name: "ldap_phpldapadmin_1" }
-    - { name: "mail_dovecot-mailcow_1" }
-    - { name: "mail_dockerapi-mailcow_1" }
-    - { name: "mail_ipv6nat-mailcow_1" }
-    - { name: "mail_mailman-core" }
-    - { name: "mail_mailman-db" }
-    - { name: "mail_mailman-nginx" }
-    - { name: "mail_mailman-web" }
-    - { name: "mail_memcached-mailcow_1" }
-    - { name: "mail_mysql-mailcow_1" }
-    - { name: "mail_netfilter-mailcow_1" }
-    - { name: "mail_nginx-mailcow_1" }
-    - { name: "mail_olefy-mailcow_1" }
-    - { name: "mail_ofelia-mailcow_1" }
-    - { name: "mail_postfix-mailcow_1" }
-    - { name: "mail_postfix-exporter_1" }
-    - { name: "mail_php-fpm-mailcow_1" }
-    - { name: "mail_redis-mailcow_1" }
-    - { name: "mail_rspamd-mailcow_1" }
-    - { name: "mail_traefik-certdumper_1" }    
-    - { name: "mail_unbound-mailcow_1" }
-    - { name: "mail_watchdog-mailcow_1" }
+    - { name: "mail_admin_1" }
+    - { name: "mail_antispam_1" }
+    - { name: "mail_certdumper_1" }
+    - { name: "mail_db_1" }
+    - { name: "mail_front_1" }
+    - { name: "mail_imap_1" }
+    - { name: "mail_oletools_1" }
+    - { name: "mail_redis_1" }
+    - { name: "mail_resolver_1" }
+    - { name: "mail_smtp_1" }
+    - { name: "mail_webmail_1" }
+    - { name: "mail_mailman-core_1" }
+    - { name: "mail_mailman-web_1" }
+    - { name: "mail_mailman-nginx_1" }
     - { name: "matterbridge_cw_1" }
     - { name: "matterbridge_wz_1" }
     - { name: "matterbridge_web_1" }