diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a62d280..d34ca1ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The **patch** part changes incrementally at each release.
 
 ### Fixed
 * nginx: Munin url config is now a template to insert the server-status prefix
+* redis: In instance mode, ensure to replace the nrpe check_redis with the instance check script
 
 ### Security
 
diff --git a/redis/tasks/nrpe_stretch.yml b/redis/tasks/nrpe_stretch.yml
index c78e5a28..5b547071 100644
--- a/redis/tasks/nrpe_stretch.yml
+++ b/redis/tasks/nrpe_stretch.yml
@@ -12,6 +12,18 @@
     dest: /etc/nagios/nrpe.d/evolix.cfg
     regexp: '^command\[check_redis\]=.+'
     replace: 'command[check_redis]=/usr/lib/nagios/plugins/check_redis -H 127.0.0.1'
+  when: redis_instance_name is undefined
+  notify: restart nagios-nrpe-server
+  tags:
+    - redis
+    - nrpe
+
+- name: Replace check_tcp or check_redis by check_redis_instances for NRPE
+  replace:
+    dest: /etc/nagios/nrpe.d/evolix.cfg
+    regexp: '^command\[check_redis\]=.+'
+    replace: 'command[check_redis]=/usr/local/lib/nagios/plugins/check_redis_instances'
+  when: redis_instance_name is defined
   notify: restart nagios-nrpe-server
   tags:
     - redis