diff --git a/contrib/os-services/roles/prepare/tasks/main.yml b/contrib/os-services/roles/prepare/tasks/main.yml
index e95dcef1510657eee2b01ed4f9608648a24d9977..177712e42d9c1cee1501cf29d7d8df784fb10ba0 100644
--- a/contrib/os-services/roles/prepare/tasks/main.yml
+++ b/contrib/os-services/roles/prepare/tasks/main.yml
@@ -7,7 +7,7 @@
     service_facts:
 
   - name: Disable service firewalld
-    systemd:
+    systemd_service:
       name: firewalld
       state: stopped
       enabled: no
@@ -15,7 +15,7 @@
       "'firewalld.service' in services and services['firewalld.service'].status != 'not-found'"
 
   - name: Disable service ufw
-    systemd:
+    systemd_service:
       name: ufw
       state: stopped
       enabled: no
diff --git a/roles/bootstrap-os/tasks/clearlinux.yml b/roles/bootstrap-os/tasks/clearlinux.yml
index de42e3cf1134dc2392a95958dc12467111b01108..2e41eaa015e76b3fbff47723c38fdd6312cabe7d 100644
--- a/roles/bootstrap-os/tasks/clearlinux.yml
+++ b/roles/bootstrap-os/tasks/clearlinux.yml
@@ -7,7 +7,7 @@
     state: present
 
 - name: Make sure docker service is enabled
-  systemd:
+  systemd_service:
     name: docker
     masked: false
     enabled: true
diff --git a/roles/bootstrap-os/tasks/flatcar.yml b/roles/bootstrap-os/tasks/flatcar.yml
index d5ecda8fa8e1a73819a4ffa754fea16795be52af..be74150a0baec44ea316a9bfb005e8dae61cee68 100644
--- a/roles/bootstrap-os/tasks/flatcar.yml
+++ b/roles/bootstrap-os/tasks/flatcar.yml
@@ -26,7 +26,7 @@
     ansible_interpreter_python_fallback: "{{ ansible_interpreter_python_fallback + [ '/opt/bin/python' ] }}"
 
 - name: Disable auto-upgrade
-  systemd:
+  systemd_service:
     name: locksmithd.service
     masked: true
     state: stopped
diff --git a/roles/container-engine/containerd/handlers/main.yml b/roles/container-engine/containerd/handlers/main.yml
index 1959dc991714b18e1865d7bc9a886cda4201bc60..4e7722f4fb29520a0cc70b53dba62d06c5e21012 100644
--- a/roles/container-engine/containerd/handlers/main.yml
+++ b/roles/container-engine/containerd/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Containerd | restart containerd
-  systemd:
+  systemd_service:
     name: containerd
     state: restarted
     enabled: yes
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index 657d1ad75158651d7dc09624c165579b4acbfd95..073412cd0a0d6ab1024bb3e4d49c3cf29c071c4b 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -136,7 +136,7 @@
   meta: flush_handlers
 
 - name: Containerd | Ensure containerd is started and enabled
-  systemd:
+  systemd_service:
     name: containerd
     daemon_reload: yes
     enabled: yes
diff --git a/roles/container-engine/cri-dockerd/handlers/main.yml b/roles/container-engine/cri-dockerd/handlers/main.yml
index 3a249791669b9b7d5a113f71867375202f53e31a..00d00e7b2b9eb620ddae8eb3b889572f032aa43d 100644
--- a/roles/container-engine/cri-dockerd/handlers/main.yml
+++ b/roles/container-engine/cri-dockerd/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Cri-dockerd | reload systemd
-  systemd:
+  systemd_service:
     name: cri-dockerd
     daemon_reload: true
     masked: no
diff --git a/roles/container-engine/cri-o/handlers/main.yml b/roles/container-engine/cri-o/handlers/main.yml
index b0c5951fda8aee0210a797491da3f3bdd9edfd6a..d173ce41b00e0046c5f9075dce6c9c1de86e014a 100644
--- a/roles/container-engine/cri-o/handlers/main.yml
+++ b/roles/container-engine/cri-o/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: CRI-O | reload systemd
-  systemd:
+  systemd_service:
     daemon_reload: true
   listen: Restart crio
 
diff --git a/roles/container-engine/docker/handlers/main.yml b/roles/container-engine/docker/handlers/main.yml
index 4a8a63948bd6c3ed16ce25c619806f46e50f3897..72e95e6bf5b1041cd3afb0f55095b23a72078cb6 100644
--- a/roles/container-engine/docker/handlers/main.yml
+++ b/roles/container-engine/docker/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Docker | reload systemd
-  systemd:
+  systemd_service:
     name: docker
     daemon_reload: true
     masked: no
diff --git a/roles/container-engine/docker/tasks/reset.yml b/roles/container-engine/docker/tasks/reset.yml
index 40d19a4ff84b7fc0f4f90469d143b25b4d770f5e..725e64861f8a90e5fe4be81a0327a5be846e3ba0 100644
--- a/roles/container-engine/docker/tasks/reset.yml
+++ b/roles/container-engine/docker/tasks/reset.yml
@@ -102,5 +102,5 @@
   ignore_errors: true  # noqa ignore-errors
 
 - name: Docker | systemctl daemon-reload  # noqa no-handler
-  systemd:
+  systemd_service:
     daemon_reload: true
diff --git a/roles/etcd/handlers/main.yml b/roles/etcd/handlers/main.yml
index 33890617aec54201122ac168d28f284d8cf7e9e7..62a8999456e54ea71838b97430de957bc99d47d9 100644
--- a/roles/etcd/handlers/main.yml
+++ b/roles/etcd/handlers/main.yml
@@ -3,7 +3,7 @@
   import_tasks: backup.yml
 
 - name: Etcd | reload systemd
-  systemd:
+  systemd_service:
     daemon_reload: true
   listen:
     - Restart etcd
diff --git a/roles/etcd/tasks/configure.yml b/roles/etcd/tasks/configure.yml
index 6afc5eba010769db53ef214ccaedfa7a4ad5a270..4cf5387a09d6ec16dc80f1f8649352b1a9fc7f94 100644
--- a/roles/etcd/tasks/configure.yml
+++ b/roles/etcd/tasks/configure.yml
@@ -68,7 +68,7 @@
   when: is_etcd_master and etcd_events_cluster_setup
 
 - name: Configure | reload systemd
-  systemd:
+  systemd_service:
     daemon_reload: true
   when: is_etcd_master
 
diff --git a/roles/kubernetes/control-plane/handlers/main.yml b/roles/kubernetes/control-plane/handlers/main.yml
index 1ee64f230696dd84f8ae3b672cf511f6c7f0a778..be5fdffb125717b01f0a14fef20c83063117bfc5 100644
--- a/roles/kubernetes/control-plane/handlers/main.yml
+++ b/roles/kubernetes/control-plane/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Master | reload systemd
-  systemd:
+  systemd_service:
     daemon_reload: true
   listen: Master | restart kubelet
 
diff --git a/roles/kubernetes/control-plane/tasks/main.yml b/roles/kubernetes/control-plane/tasks/main.yml
index b1e2ee2a926add19d71c3555c420ffcd785be857..5d58014e80ba5bfc7376f2fd23109bb30c790bb9 100644
--- a/roles/kubernetes/control-plane/tasks/main.yml
+++ b/roles/kubernetes/control-plane/tasks/main.yml
@@ -118,7 +118,7 @@
   when: auto_renew_certificates
 
 - name: Renew K8S control plane certificates monthly 2/2
-  systemd:
+  systemd_service:
     name: k8s-certs-renew.timer
     enabled: yes
     state: started
diff --git a/roles/kubernetes/kubeadm/handlers/main.yml b/roles/kubernetes/kubeadm/handlers/main.yml
index 9f6d4318b6cfbf3b12b76a5ee6a261f160390a0a..261e1f2c1ab167c23e63e6b90c6c4f53c347dab3 100644
--- a/roles/kubernetes/kubeadm/handlers/main.yml
+++ b/roles/kubernetes/kubeadm/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Kubeadm | reload systemd
-  systemd:
+  systemd_service:
     daemon_reload: true
   listen: Kubeadm | restart kubelet
 
diff --git a/roles/kubernetes/node/handlers/main.yml b/roles/kubernetes/node/handlers/main.yml
index 8195b7d06bacb635faad78d8300ad60a97d8a5e0..fa08dba536e87950c91d46874085d6691e545039 100644
--- a/roles/kubernetes/node/handlers/main.yml
+++ b/roles/kubernetes/node/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Kubelet | reload systemd
-  systemd:
+  systemd_service:
     daemon_reload: true
   listen: Node | restart kubelet
 
diff --git a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
index c08a86e451569180b10be529d766be3889861e02..5b2c7d10af93661d0ff3b4c8383262e7a282b352 100644
--- a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
+++ b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
@@ -138,7 +138,7 @@
 
 - name: Disable fapolicyd service
   failed_when: false
-  systemd:
+  systemd_service:
     name: fapolicyd
     state: stopped
     enabled: false
diff --git a/roles/recover_control_plane/etcd/tasks/recover_lost_quorum.yml b/roles/recover_control_plane/etcd/tasks/recover_lost_quorum.yml
index 32db5799ebd2797b083c9d8b26e91eebced9d4e5..7c8b0e927a75890b482e9a08a69eb2bca55caea4 100644
--- a/roles/recover_control_plane/etcd/tasks/recover_lost_quorum.yml
+++ b/roles/recover_control_plane/etcd/tasks/recover_lost_quorum.yml
@@ -17,7 +17,7 @@
   when: etcd_snapshot is defined
 
 - name: Stop etcd
-  systemd:
+  systemd_service:
     name: etcd
     state: stopped
 
@@ -54,6 +54,6 @@
     replace: '\1{{ etcd_member_name }}={{ etcd_peer_url }}'
 
 - name: Start etcd
-  systemd:
+  systemd_service:
     name: etcd
     state: started
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 9869cbc782f23d8d3a0f283e5fa512fd91dd0088..6b5379e103fabf3334073748b11d0ae808c20cc4 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -43,7 +43,7 @@
     - docker
 
 - name: Reset | systemctl daemon-reload  # noqa no-handler
-  systemd:
+  systemd_service:
     daemon_reload: true
   when: services_removed.changed