diff --git a/nagios/tasks/hardware-checks.yml b/nagios/tasks/hardware-checks.yml
index 29df2b57..84370f22 100644
--- a/nagios/tasks/hardware-checks.yml
+++ b/nagios/tasks/hardware-checks.yml
@@ -1,5 +1,5 @@
 ---
-# The original check_linux_raid is often buggy
+# We do not use the check_linux_raid plugin anymore. Now the check_raid one is much better.
 - name: Install some plugins that check hardware parts
   copy: src={{ item }} dest={{ nagios_isti_plugdir }}/{{ item }} owner=root group=nagios mode=0750
   with_items:
diff --git a/nagios/templates/common-nrpe.cfg.j2 b/nagios/templates/common-nrpe.cfg.j2
index 24bcf5d5..2158e1ae 100644
--- a/nagios/templates/common-nrpe.cfg.j2
+++ b/nagios/templates/common-nrpe.cfg.j2
@@ -23,7 +23,8 @@ command[global_show_users]={{ nagios_isti_plugdir }}/show_users -a {{ nagios_all
 command[global_check_system_pp]={{ nagios_isti_plugdir }}/check_system_pp
 
 # Linux RAID check
-command[global_check_linux_raid]={{ nagios_isti_plugdir }}/check_linux_raid
+#command[global_check_linux_raid]={{ nagios_isti_plugdir }}/check_linux_raid
+command[global_check_linux_raid]={{ nagios_isti_plugdir }}/check_raid
 
 # Disks S.M.A.R.T. check
 command[global_check_smart]={{ nagios_isti_plugdir }}/check_smart -d $ARG1$ -i $ARG2$