diff --git a/redis/handlers/main.yml b/redis/handlers/main.yml
index ba071756..d85dcbf8 100644
--- a/redis/handlers/main.yml
+++ b/redis/handlers/main.yml
@@ -18,3 +18,8 @@
   service:
     name: nagios-nrpe-server
     state: restarted
+
+- name: restart log2mail
+  service:
+    name: log2mail
+    state: restarted
diff --git a/redis/tasks/default-log2mail.yml b/redis/tasks/default-log2mail.yml
new file mode 100644
index 00000000..0bc6a9b4
--- /dev/null
+++ b/redis/tasks/default-log2mail.yml
@@ -0,0 +1,20 @@
+---
+
+- name: log2mail config is present
+  blockinfile:
+    dest: /etc/log2mail/config/redis.conf
+    owner: log2mail
+    group: adm
+    mode: "0640"
+    create: yes
+    marker: "# {mark} ANSIBLE MANAGED RULES FOR DEFAULT INSTANCE"
+    content: |
+      file = {{ redis_log_dir }}/redis-server.log
+      pattern = "Cannot allocate memory"
+      mailto = {{ log2mail_alert_email or general_alert_email | mandatory }}
+      template = /etc/log2mail/mail
+  notify: restart log2mail
+  when: log2mail_config_dir.stat.exists
+  tags:
+    - redis
+    - log2mail
diff --git a/redis/tasks/instance-log2mail.yml b/redis/tasks/instance-log2mail.yml
new file mode 100644
index 00000000..08a0a6f7
--- /dev/null
+++ b/redis/tasks/instance-log2mail.yml
@@ -0,0 +1,20 @@
+---
+
+- name: log2mail config is present
+  blockinfile:
+    dest: /etc/log2mail/config/redis.conf
+    owner: log2mail
+    group: adm
+    mode: "0640"
+    create: yes
+    marker: "# {mark} ANSIBLE MANAGED RULES FOR INSTANCE {{ redis_instance_name }}"
+    content: |
+      file = {{ redis_log_dir }}/redis-server.log
+      pattern = "Cannot allocate memory"
+      mailto = {{ log2mail_alert_email or general_alert_email | mandatory }}
+      template = /etc/log2mail/mail
+  notify: restart log2mail
+  when: log2mail_config_dir.stat.exists
+  tags:
+    - redis
+    - log2mail
diff --git a/redis/tasks/log2mail.yml b/redis/tasks/log2mail.yml
deleted file mode 100644
index 63d0156a..00000000
--- a/redis/tasks/log2mail.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-- name: Is log2mail present ?
-  stat:
-    path: /etc/log2mail/config
-  check_mode: no
-  register: log2mail_config_dir
-  tags:
-    - redis
-    - log2mail
-
-- name: Copy log2mail config
-  template:
-    src: log2mail.j2
-    dest: /etc/log2mail/config/redis.conf
-    owner: log2mail
-    group: adm
-    mode: "0640"
-  when: log2mail_config_dir.stat.exists
-  tags:
-    - redis
-    - log2mail
diff --git a/redis/tasks/main.yml b/redis/tasks/main.yml
index 460843e4..fd7588c2 100644
--- a/redis/tasks/main.yml
+++ b/redis/tasks/main.yml
@@ -81,6 +81,32 @@
     - redis
     - munin
 
+- name: Is log2mail installed
+  stat:
+    path: /etc/log2mail/config
+  register: _log2mail_installed
+  tags:
+    - redis
+    - log2mail
+
+- include: default-log2mail.yml
+  when:
+    - _log2mail_installed.stat.exists
+    - _log2mail_installed.stat.isdir
+    - redis_instance_name is undefined
+  tags:
+    - redis
+    - log2mail
+
+- include: instance-log2mail.yml
+  when:
+    - _log2mail_installed.stat.exists
+    - _log2mail_installed.stat.isdir
+    - redis_instance_name is defined
+  tags:
+    - redis
+    - log2mail
+
 - name: is NRPE present ?
   stat:
     path: /etc/nagios/nrpe.d/evolix.cfg
diff --git a/redis/templates/log2mail.j2 b/redis/templates/log2mail.j2
deleted file mode 100644
index b742efa8..00000000
--- a/redis/templates/log2mail.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-file = /var/log/redis/redis-server.log
-pattern = "Can't save in background: fork: Cannot allocate memory"
-mailto = {{ log2mail_alert_email or general_alert_email | mandatory }}
-template = /etc/log2mail/mail