diff --git a/roles/munin_node/handlers/main.yml b/roles/munin_node/handlers/main.yml
index 5588bd3..5907627 100644
--- a/roles/munin_node/handlers/main.yml
+++ b/roles/munin_node/handlers/main.yml
@@ -1,9 +1,10 @@
 ---
-- name: restart munin-node
-  service:
+- name: Restart munin-node
+  ansible.builtin.service:
     name: "{{ munin_node_service }}"
     state: restarted
 
-- name: munin-node configure
-  shell: munin-node-configure --shell --remove-also 2> /dev/null | /bin/sh
-  notify: restart munin-node
+- name: Configure munin-node
+  ansible.builtin.shell:
+    cmd: munin-node-configure --shell --remove-also 2> /dev/null | /bin/sh
+  notify: Restart munin-node
diff --git a/roles/munin_node/tasks/main.yml b/roles/munin_node/tasks/main.yml
index 661514c..9cb139b 100644
--- a/roles/munin_node/tasks/main.yml
+++ b/roles/munin_node/tasks/main.yml
@@ -1,24 +1,24 @@
 ---
-- name: include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
+- name: Include OS-specific variables
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
-- name: install packages
-  package:
+- name: Install packages
+  ansible.builtin.package:
     name: "{{ item }}"
     state: installed
   with_items: "{{ munin_node_packages }}"
 
-- name: create config
-  template:
+- name: Create config
+  ansible.builtin.template:
     dest: /etc/munin/munin-node.conf
     src: munin-node.conf.j2
     mode: 0644
     owner: root
     group: "{{ ansible_wheel }}"
-  notify: munin-node configure
+  notify: Configure munin-node
 
-- name: enable service
-  service:
+- name: Enable service
+  ansible.builtin.service:
     name: "{{ munin_node_service }}"
     state: started
     enabled: true