diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 1a3ba9cb24..45021626b7 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -45,13 +45,13 @@
 - name: install nrpe client configs
   template: src=$item dest=/etc/nrpe.d/$item
   with_items:
-  - check_mirrorlist_cache.cfg
-  - check_raid.cfg
-  - check_cron.cfg
-  - check_disk.cfg
-  - check_swap.cfg
-  - check_postfix_queue.cfg
-  - check_lock.cfg
+  - check_mirrorlist_cache.cfg.j2
+  - check_raid.cfg.j2
+  - check_cron.cfg.j2
+  - check_disk.cfg.j2
+  - check_swap.cfg.j2
+  - check_postfix_queue.cfg.j2
+  - check_lock.cfg.j2
   notify:
   - restart nrpe
   tags:
diff --git a/roles/nagios_client/files/check_cron.cfg b/roles/nagios_client/templates/check_cron.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_cron.cfg
rename to roles/nagios_client/templates/check_cron.cfg.j2
diff --git a/roles/nagios_client/files/check_disk.cfg b/roles/nagios_client/templates/check_disk.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_disk.cfg
rename to roles/nagios_client/templates/check_disk.cfg.j2
diff --git a/roles/nagios_client/files/check_lock.cfg b/roles/nagios_client/templates/check_lock.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_lock.cfg
rename to roles/nagios_client/templates/check_lock.cfg.j2
diff --git a/roles/nagios_client/files/check_mirrorlist_cache.cfg b/roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_mirrorlist_cache.cfg
rename to roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2
diff --git a/roles/nagios_client/files/check_postfix_queue.cfg b/roles/nagios_client/templates/check_postfix_queue.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_postfix_queue.cfg
rename to roles/nagios_client/templates/check_postfix_queue.cfg.j2
diff --git a/roles/nagios_client/files/check_raid.cfg b/roles/nagios_client/templates/check_raid.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_raid.cfg
rename to roles/nagios_client/templates/check_raid.cfg.j2
diff --git a/roles/nagios_client/files/check_swap.cfg b/roles/nagios_client/templates/check_swap.cfg.j2
similarity index 100%
rename from roles/nagios_client/files/check_swap.cfg
rename to roles/nagios_client/templates/check_swap.cfg.j2