diff --git a/roles/mail_server/handlers/main.yml b/roles/mail_server/handlers/main.yml
index 3a8553c1819916d9531bdd83a580bf79b2f7ce16..6bb6f5bd1903583433ed1c06320992f9f7253242 100644
--- a/roles/mail_server/handlers/main.yml
+++ b/roles/mail_server/handlers/main.yml
@@ -1,17 +1,17 @@
 ---
 
 - name: Restart Postfix
-  service:
+  ansible.builtin.service:
     name: postfix
     state: restarted
 
 - name: Restart Dovecot
-  service:
+  ansible.builtin.service:
     name: dovecot
     state: restarted
 
 - name: Restart ClamAV Milter
-  service:
+  ansible.builtin.service:
     name: clamav-milter
     state: restarted
 
@@ -20,4 +20,4 @@
   #   This task is invoked only if user is very specific about requiring to
   #   run the handlers manually as a way to bring the system to consistency
   #   after interrupted runs.
-  command: /usr/bin/newaliases
+  ansible.builtin.command: /usr/bin/newaliases