diff --git a/roles/base/tasks/mail.yml b/roles/base/tasks/mail.yml
index dacd60d..44e1fd8 100644
--- a/roles/base/tasks/mail.yml
+++ b/roles/base/tasks/mail.yml
@@ -4,10 +4,20 @@
     path: /etc/rc.local
     line:
       'date | mail -s "boot/reboot of $(hostname -s)" {{ general_alert_email }}'
+    insertbefore: 'echo'
     create: true
   tags:
     - misc
 
+- name: Delete rc.local entry of boot/reboot not precising hostname
+  lineinfile:
+    path: /etc/rc.local
+    regexp:
+      "^.* mail -s (?!.*of.*).+$"
+    state: absent
+  tags:
+    - misc
+
 - name: Set root mail alias
   replace:
     dest: /etc/mail/aliases