diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 5bd739c169425f9999d638c49d843bd6d3f6012e..022af6ddfc1b2b20e04ab592c9e04293b0f861da 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -5,10 +5,10 @@
   #   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/sbin/pam-auth-update --package"
+  ansible.builtin.command: "/usr/sbin/pam-auth-update --package"
 
 - name: Restart SSH
-  service:
+  ansible.builtin.service:
     name: ssh
     state: restarted
 
@@ -17,19 +17,19 @@
   #   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/sbin/update-ca-certificates --fresh"
+  ansible.builtin.command: "/usr/sbin/update-ca-certificates --fresh"
 
 - name: Restart ferm
-  service:
+  ansible.builtin.service:
     name: ferm
     state: restarted
 
 - name: Reload systemd
-  systemd:
+  ansible.builtin.systemd:
     daemon_reload: true
 
 - name: Restart NTP server
-  service:
+  ansible.builtin.service:
     name: ntpsec
     state: restarted
   when: ntp_pools | length > 0