diff --git a/handlers/main.yml b/handlers/main.yml
index 631b0d6b0ade8276e96bb1798253db332c67f06c..56b8ceccb5e9315268d1e18674066d3c1eef9b3d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,16 +1,16 @@
 ---
 # https://docs.ansible.com/ansible/latest/collections/ansible/builtin/systemd_module.html
 - name: systemctl daemon-reload
-  systemd:
+  ansible.builtin.systemd:
     daemon-reload: "yes"
 
 - name: enable systemd-units
-  command: "systemctl enable /etc/systemd/user/{{ item.key }}.service"
-  loop: "{{ vault_service_files }}"
+  ansible.builtin.command: "systemctl enable /etc/systemd/user/{{ item }}.service"
+  loop: "{{ vault_service_files.keys() | list }}"
 
 # https://docs.ansible.com/ansible/latest/collections/ansible/builtin/systemd_module.html
 - name: restart repairtools
-  systemd:
+  ansible.builtin.systemd:
     name: "{{ item }}.service"
     state: restarted
-  loop: "{{ vault_service_files }}"
+  loop: "{{ vault_service_files.keys() | list }}"