diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c935b68..5fe9bdab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * nagios-nrpe: check\_ssl\_local now has an output that nrpe can understand when it isn't OK
 * nginx: set default server directive in default vhost
 * opendkim: update apt cache before install
+* redis: replace errorneous ini_file module for Munin config, fix dedicted Munin config filename (z-XXX).
 
 ### Removed
 
diff --git a/redis/tasks/default-munin.yml b/redis/tasks/default-munin.yml
index c7e18cff..bdbe47d2 100644
--- a/redis/tasks/default-munin.yml
+++ b/redis/tasks/default-munin.yml
@@ -11,14 +11,6 @@
   tags:
     - redis
 
-- name: Create plugin directory
-  ansible.builtin.file:
-    name: /usr/local/lib/munin/
-    state: directory
-    mode: "0755"
-  tags:
-    - redis
-
 - name: Create plugin directory
   ansible.builtin.file:
     name: /usr/local/lib/munin/plugins/
@@ -63,20 +55,18 @@
   changed_when: False
   check_mode: no
 
-- name: Add redis password for munin (if no more than 1 config block)
-  community.general.ini_file:
-    dest: /etc/munin/plugin-conf.d/munin-node
-    section: 'redis_*'
-    option: env.password
-    value: '{{ redis_password }}'
-  notify: restart munin-node
+- name: Configure redis plugin for munin
+  ansible.builtin.template:
+    src: templates/munin-plugin-default.conf.j2
+    dest: '/etc/munin/plugin-conf.d/z-evolinux-redis'
+    mode: "0740"
   when:
     - redis_password is not none
     - redis_password | length > 0
     - (munin_redis_blocs_in_config.stdout | int) <= 1
+  notify: restart munin-node
   tags: redis
 
-
 - name: Warn if multiple instance in munin-plugins configuration
   ansible.builtin.debug:
     msg: "WARNING - It seems you have multiple redis sections in your munin-node configuration - Munin config NOT changed"
diff --git a/redis/tasks/instance-munin.yml b/redis/tasks/instance-munin.yml
index 4492ccd7..8d0adf7e 100644
--- a/redis/tasks/instance-munin.yml
+++ b/redis/tasks/instance-munin.yml
@@ -11,14 +11,6 @@
   tags:
     - redis
 
-- name: Create plugin directory
-  ansible.builtin.file:
-    name: /usr/local/lib/munin/
-    state: directory
-    mode: "0755"
-  tags:
-    - redis
-
 - name: Create plugin directory
   ansible.builtin.file:
     name: /usr/local/lib/munin/plugins/
@@ -58,7 +50,7 @@
 - name: Configure redis plugin for munin
   ansible.builtin.template:
     src: templates/munin-plugin-instances.conf.j2
-    dest: '/etc/munin/plugin-conf.d/evolinux.redis_{{ redis_instance_name }}'
+    dest: '/etc/munin/plugin-conf.d/z-evolinux-redis_{{ redis_instance_name }}'
     mode: "0740"
   notify: restart munin-node
   tags: redis
diff --git a/redis/templates/munin-plugin-default.conf.j2 b/redis/templates/munin-plugin-default.conf.j2
new file mode 100644
index 00000000..674c257d
--- /dev/null
+++ b/redis/templates/munin-plugin-default.conf.j2
@@ -0,0 +1,6 @@
+# Ansible managed
+
+{% if redis_password %}
+[redis_*]
+env.password {{ redis_password | replace("#", "\#") }}
+{% endif %}