diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5609e751b..6da8962b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,48 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [Apt] Switch influxdata repository to "stable"
 - [Apt] Remove apt-transport-https default package
 - [Apt] Update Grafana key
+- [Apparmor] Remove handler "apparmor reload" in favor of "Reload apparmor"
+- [Cron] Remove handler "cron restart" in favor of "Restart cron"
+- [Dhcp] Remove handler "dhcp restart" in favor of "Restart dhcp"
+- [Dsnqmasq] Remove handler "dnsmasq restart" in favor of "Restart dnsmasq"
+- [Docker] Remove handler "docker restart" in favor of "Restart docker"
+- [Elasticsearch] Remove handler "elasticsearch restart" in favor of "Restart elasticsearch"
+- [Fail2ban] Remove handler "fail2ban restart" in favor of "Restart fail2ban"
+- [Gitlab] Remove handler "gitlab reconfigure" in favor of "Reconfigure gitlab"
+- [Gitlab] Remove handler "gitlab restart" in favor of "Restart gitlab"
+- [Grafana] Remove handler "grafana restart" in favor of "Restart grafana"
+- [Haproxy] Remove handler "haproxy reload" in favor of "Reload haproxy"
+- [Haproxy] Remove handler "haproxy restart" in favor of "Restart haproxy"
+- [InfluxDB] Remove handler "influxdb restart" in favor of "Restart influxdb"
+- [InfluxDB] Remove handler "influxdb start" in favor of "Start influxdb"
+- [Keepalived] Remove handler "keepalived restart" in favor of "Restart keepalived"
+- [Keepalived] Remove handler "keepalived reload" in favor of "Reload keepalived"
+- [MaxScale] Remove handler "maxscale restart" in favor of "Restart maxscale"
+- [MongoDB] Remove handler "mongodb restart" in favor of "Restart mongodb"
+- [MySQL] Remove handler "mysql restart" in favor of "Restart mysql"
+- [Network] Remove handler "networking restart" in favor of "Restart networking"
+- [Nginx] Remove handler "nginx restart" in favor of "Restart nginx"
+- [Nginx] Remove handler "do nginx restart" in favor of "Do restart nginx"
+- [Php] Remove handler "php restart" in favor of "Restart php fpm"
+- [Php] Remove handler "php fpm restart" in favor of "Restart php fpm"
+- [Php] Remove handler "do php fpm restart" in favor of "Do restart php fpm"
+- [Php] Remove handler "php blackfire agent restart" in favor of "Restart php blackfire agent"
+- [Proftpd] Remove handler "proftpd restart" in favor of "Restart proftpd"
+- [Prometheus] Remove handler "prometheus restart" in favor of "Restart prometheus"
+- [Prometheus] Remove handler "prometheus node exporter restart" in favor of "Restart prometheus node exporter"
+- [Prometheus] Remove handler "prometheus nginx exporter restart" in favor of "Restart prometheus nginx exporter"
+- [Prometheus] Remove handler "prometheus php fpm exporter restart" in favor of "Restart prometheus php fpm exporter"
+- [Promtail] Remove handler "promtail restart" in favor of "Restart promtail"
+- [Redis] Remove handler "redis restart" in favor of "Restart redis"
+- [Redis] Remove handler "redis-sentinel restart" in favor of "Restart redis-sentinel"
+- [RSyslog] Remove handler "rsyslog restart" in favor of "Restart rsyslog"
+- [SensuGo] Remove handler "sensu-backend restart" in favor of "Restart sensu-backend"
+- [SensuGo] Remove handler "sensu-agent restart" in favor of "Restart sensu-agent"
+- [Shorewall] Remove handler "shorewall restart" in favor of "Restart shorewall"
+- [Ssh] Remove handler "ssh reload" in favor of "Reload ssh"
+- [Supervisor] Remove handler "supervisor restart" in favor of "Restart supervisor"
+- [Systemd] Remove handler "systemd reload" in favor of "Reload systemd"
+- [Telegraf] Remove handler "telegraf restart" in favor of "Restart telegraf"
 
 ### Added
 - [Apt] Add HAProxy 2.8 repository
diff --git a/roles/apparmor/handlers/main.yaml b/roles/apparmor/handlers/main.yaml
index 0af643341..a501250b8 100644
--- a/roles/apparmor/handlers/main.yaml
+++ b/roles/apparmor/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: reloaded
   loop:
     - apparmor
-  # Deprecated
-  listen: apparmor reload
diff --git a/roles/cron/handlers/main.yaml b/roles/cron/handlers/main.yaml
index c7866c420..a027e5241 100644
--- a/roles/cron/handlers/main.yaml
+++ b/roles/cron/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - cron
-  # Deprecated
-  listen: cron restart
diff --git a/roles/dhcp/handlers/main.yaml b/roles/dhcp/handlers/main.yaml
index 6a37445a7..02787a6e4 100644
--- a/roles/dhcp/handlers/main.yaml
+++ b/roles/dhcp/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - isc-dhcp-server
-  # Deprecated
-  listen: dhcp restart
diff --git a/roles/dnsmasq/handlers/main.yaml b/roles/dnsmasq/handlers/main.yaml
index f06e55125..67c8748a0 100644
--- a/roles/dnsmasq/handlers/main.yaml
+++ b/roles/dnsmasq/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - dnsmasq
-  # Deprecated
-  listen: dnsmasq restart
diff --git a/roles/docker/handlers/main.yaml b/roles/docker/handlers/main.yaml
index d456fdd35..900de0c7a 100644
--- a/roles/docker/handlers/main.yaml
+++ b/roles/docker/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - docker
-  # Deprecated
-  listen: docker restart
diff --git a/roles/elasticsearch/handlers/main.yaml b/roles/elasticsearch/handlers/main.yaml
index e35937fc1..7b3366dac 100644
--- a/roles/elasticsearch/handlers/main.yaml
+++ b/roles/elasticsearch/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - elasticsearch
-  # Deprecated
-  listen: elasticsearch restart
diff --git a/roles/fail2ban/handlers/main.yaml b/roles/fail2ban/handlers/main.yaml
index ff1356342..203e41351 100644
--- a/roles/fail2ban/handlers/main.yaml
+++ b/roles/fail2ban/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - fail2ban
-  # Deprecated
-  listen: fail2ban restart
diff --git a/roles/gitlab/handlers/main.yaml b/roles/gitlab/handlers/main.yaml
index dcfb5a286..d5d2dc5dd 100644
--- a/roles/gitlab/handlers/main.yaml
+++ b/roles/gitlab/handlers/main.yaml
@@ -3,11 +3,7 @@
 - name: Reconfigure gitlab
   ansible.builtin.command:
     cmd: gitlab-ctl reconfigure
-  # Deprecated
-  listen: gitlab reconfigure
 
 - name: Restart gitlab
   ansible.builtin.command:
     cmd: gitlab-ctl restart
-  # Deprecated
-  listen: gitlab restart
diff --git a/roles/grafana/handlers/main.yaml b/roles/grafana/handlers/main.yaml
index 0fb7cb1c1..299b5b07b 100644
--- a/roles/grafana/handlers/main.yaml
+++ b/roles/grafana/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - grafana-server
-  # Deprecated
-  listen: grafana restart
diff --git a/roles/haproxy/handlers/main.yaml b/roles/haproxy/handlers/main.yaml
index 33a1736d7..5cf5bdde4 100644
--- a/roles/haproxy/handlers/main.yaml
+++ b/roles/haproxy/handlers/main.yaml
@@ -6,8 +6,6 @@
     state: reloaded
   loop:
     - haproxy
-  # Deprecated
-  listen: haproxy reload
 
 - name: Restart haproxy
   ansible.builtin.service:
@@ -15,5 +13,3 @@
     state: restarted
   loop:
     - haproxy
-  # Deprecated
-  listen: haproxy restart
diff --git a/roles/influxdb/handlers/main.yaml b/roles/influxdb/handlers/main.yaml
index 5a163a039..ad3a6ed6e 100644
--- a/roles/influxdb/handlers/main.yaml
+++ b/roles/influxdb/handlers/main.yaml
@@ -7,8 +7,6 @@
   loop:
     - influxdb
   notify: Start influxdb
-  # Deprecated
-  listen: influxdb restart
 
 - name: Start influxdb
   ansible.builtin.service:
@@ -20,5 +18,3 @@
   until: __manala_influxdb_services is not failed
   retries: 12
   delay: 1
-  # Deprecated
-  listen: influxdb start
diff --git a/roles/keepalived/handlers/main.yaml b/roles/keepalived/handlers/main.yaml
index 3e9c8d15a..60662395e 100644
--- a/roles/keepalived/handlers/main.yaml
+++ b/roles/keepalived/handlers/main.yaml
@@ -6,8 +6,6 @@
     state: restarted
   loop:
     - keepalived
-  # Deprecated
-  listen: keepalived restart
 
 - name: Reload keepalived
   ansible.builtin.service:
@@ -15,5 +13,3 @@
     state: reloaded
   loop:
     - keepalived
-  # Deprecated
-  listen: keepalived reload
diff --git a/roles/maxscale/handlers/main.yaml b/roles/maxscale/handlers/main.yaml
index a1df35c1d..9ed6615eb 100644
--- a/roles/maxscale/handlers/main.yaml
+++ b/roles/maxscale/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - maxscale
-  # Deprecated
-  listen: maxscale restart
diff --git a/roles/mongodb/handlers/main.yaml b/roles/mongodb/handlers/main.yaml
index e460b5ca8..da45483b9 100644
--- a/roles/mongodb/handlers/main.yaml
+++ b/roles/mongodb/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - mongod
-  # Deprecated
-  listen: mongodb restart
diff --git a/roles/mysql/handlers/main.yaml b/roles/mysql/handlers/main.yaml
index 502121cf8..0c4bec862 100644
--- a/roles/mysql/handlers/main.yaml
+++ b/roles/mysql/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - mysql
-  # Deprecated
-  listen: mysql restart
diff --git a/roles/network/handlers/main.yaml b/roles/network/handlers/main.yaml
index 43d9d3cea..38ac54f69 100644
--- a/roles/network/handlers/main.yaml
+++ b/roles/network/handlers/main.yaml
@@ -6,8 +6,6 @@
     state: restarted
   loop:
     - networking
-  # Deprecated
-  listen: networking restart
 
 - name: Generate netplan
   ansible.builtin.command: netplan generate
diff --git a/roles/nginx/handlers/main.yaml b/roles/nginx/handlers/main.yaml
index ff4e556d3..0ff022a85 100644
--- a/roles/nginx/handlers/main.yaml
+++ b/roles/nginx/handlers/main.yaml
@@ -6,8 +6,6 @@
   changed_when: true
   notify:
     - Do restart nginx
-  # Deprecated
-  listen: nginx restart
 
 - name: Do restart nginx
   ansible.builtin.service:
@@ -15,5 +13,3 @@
     state: restarted
   loop:
     - nginx
-  # Deprecated
-  listen: do nginx restart
diff --git a/roles/php/handlers/main.yaml b/roles/php/handlers/main.yaml
index f84c88220..e4b0c4166 100644
--- a/roles/php/handlers/main.yaml
+++ b/roles/php/handlers/main.yaml
@@ -14,10 +14,6 @@
   changed_when: true
   notify:
     - Do restart php fpm
-  # Deprecated
-  listen:
-    - php restart
-    - php fpm restart
 
 - name: Do restart php fpm
   ansible.builtin.service:
@@ -33,8 +29,6 @@
       wantstate='present',
       wantmap=true
     )
-  # Deprecated
-  listen: do php fpm restart
 
 - name: Restart php blackfire agent
   ansible.builtin.service:
@@ -42,5 +36,3 @@
     state: restarted
   loop:
     - blackfire-agent
-  # Deprecated
-  listen: php blackfire agent restart
diff --git a/roles/proftpd/handlers/main.yaml b/roles/proftpd/handlers/main.yaml
index f4ae03b12..e8c8455a4 100644
--- a/roles/proftpd/handlers/main.yaml
+++ b/roles/proftpd/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - proftpd
-  # Deprecated
-  listen: proftpd restart
diff --git a/roles/prometheus/handlers/main.yaml b/roles/prometheus/handlers/main.yaml
index 0b3d16dc6..1cd6b00d9 100644
--- a/roles/prometheus/handlers/main.yaml
+++ b/roles/prometheus/handlers/main.yaml
@@ -7,8 +7,6 @@
     daemon_reload: true
   loop:
     - "{{ manala_prometheus_service }}"
-  # Deprecated
-  listen: prometheus restart
 
 #################
 # Node Exporter #
@@ -21,8 +19,6 @@
     daemon_reload: true
   loop:
     - "{{ manala_prometheus_node_exporter_service }}"
-  # Deprecated
-  listen: prometheus node exporter restart
 
 ##################
 # Nginx Exporter #
@@ -35,8 +31,6 @@
     daemon_reload: true
   loop:
     - "{{ manala_prometheus_nginx_exporter_service }}"
-  # Deprecated
-  listen: prometheus nginx exporter restart
 
 ####################
 # Php Fpm Exporter #
@@ -49,5 +43,3 @@
     daemon_reload: true
   loop:
     - "{{ manala_prometheus_php_fpm_exporter_service }}"
-  # Deprecated
-  listen: prometheus php fpm exporter restart
diff --git a/roles/redis/handlers/main.yaml b/roles/redis/handlers/main.yaml
index aa1ff1ffb..a2695eb15 100644
--- a/roles/redis/handlers/main.yaml
+++ b/roles/redis/handlers/main.yaml
@@ -6,8 +6,6 @@
     state: restarted
   loop:
     - redis-server
-  # Deprecated
-  listen: redis restart
 
 - name: Restart redis-sentinel
   ansible.builtin.service:
@@ -15,5 +13,3 @@
     state: restarted
   loop:
     - redis-sentinel
-  # Deprecated
-  listen: redis-sentinel restart
diff --git a/roles/rsyslog/handlers/main.yaml b/roles/rsyslog/handlers/main.yaml
index 41399ff48..96c6785ec 100644
--- a/roles/rsyslog/handlers/main.yaml
+++ b/roles/rsyslog/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - rsyslog
-  # Deprecated
-  listen: rsyslog restart
diff --git a/roles/sensu_go/handlers/main.yaml b/roles/sensu_go/handlers/main.yaml
index e74c7b327..3366235d9 100644
--- a/roles/sensu_go/handlers/main.yaml
+++ b/roles/sensu_go/handlers/main.yaml
@@ -6,8 +6,6 @@
     state: restarted
   loop:
     - sensu-backend
-  # Deprecated
-  listen: sensu-backend restart
 
 - name: Restart sensu-agent
   ansible.builtin.service:
@@ -15,5 +13,3 @@
     state: restarted
   loop:
     - sensu-agent
-  # Deprecated
-  listen: sensu-agent restart
diff --git a/roles/shorewall/handlers/main.yaml b/roles/shorewall/handlers/main.yaml
index 97c93d83b..bebbf913d 100644
--- a/roles/shorewall/handlers/main.yaml
+++ b/roles/shorewall/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - shorewall
-  # Deprecated
-  listen: shorewall restart
diff --git a/roles/ssh/handlers/main.yaml b/roles/ssh/handlers/main.yaml
index 680f7e217..a73c336ec 100644
--- a/roles/ssh/handlers/main.yaml
+++ b/roles/ssh/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: reloaded
   loop:
     - ssh
-  # Deprecated
-  listen: ssh reload
diff --git a/roles/supervisor/handlers/main.yaml b/roles/supervisor/handlers/main.yaml
index 053184d6a..72aad4ca4 100644
--- a/roles/supervisor/handlers/main.yaml
+++ b/roles/supervisor/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - supervisor
-  # Deprecated
-  listen: supervisor restart
diff --git a/roles/systemd/handlers/main.yaml b/roles/systemd/handlers/main.yaml
index 59293c4f7..a5b9fd546 100644
--- a/roles/systemd/handlers/main.yaml
+++ b/roles/systemd/handlers/main.yaml
@@ -3,5 +3,3 @@
 - name: Reload systemd
   ansible.builtin.systemd:
     daemon_reload: true
-  # Deprecated
-  listen: systemd reload
diff --git a/roles/telegraf/handlers/main.yaml b/roles/telegraf/handlers/main.yaml
index 3fa134607..80b3c44b3 100644
--- a/roles/telegraf/handlers/main.yaml
+++ b/roles/telegraf/handlers/main.yaml
@@ -6,5 +6,3 @@
     state: restarted
   loop:
     - telegraf
-  # Deprecated
-  listen: telegraf restart