diff --git a/dovecot/tasks/munin.yml b/dovecot/tasks/munin.yml
index c86d8c72..4c3daf4a 100644
--- a/dovecot/tasks/munin.yml
+++ b/dovecot/tasks/munin.yml
@@ -9,20 +9,18 @@
 - name: Munin plugins are present and configured
   block:
 
-    - name: Disable dovecot plugin
+    - name: Disable Dovecot plugin
       ansible.builtin.file:
         path: /etc/munin/plugins/dovecot
         state: absent
 
-    - name: Remove old dovecot plugin conf
+    - name: Remove old Dovecot plugin conf
       ansible.builtin.file:
-        path: /etc/munin/plugin-conf.d/dovecot
-        state: absent
-
-    - name: Remove old dovecot plugin conf
-      ansible.builtin.file:
-        path: /etc/munin/plugin-conf.d/z-evolinux-dovecot
+        path: "/etc/munin/plugin-conf.d/{{ item }}"
         state: absent
+      loop:
+        - dovecot
+        - z-evolinux-dovecot
 
     - name: "Remount /usr if needed"
       ansible.builtin.include_role: