diff --git a/roles/ceph/files/nrpe.cfg b/roles/ceph/files/nrpe.d/95-ceph.cfg
similarity index 100%
rename from roles/ceph/files/nrpe.cfg
rename to roles/ceph/files/nrpe.d/95-ceph.cfg
diff --git a/roles/ceph/files/nrpe/check_ceph_mon b/roles/ceph/files/plugins/check_ceph_mon
similarity index 100%
rename from roles/ceph/files/nrpe/check_ceph_mon
rename to roles/ceph/files/plugins/check_ceph_mon
diff --git a/roles/ceph/files/nrpe/check_ceph_osd b/roles/ceph/files/plugins/check_ceph_osd
similarity index 100%
rename from roles/ceph/files/nrpe/check_ceph_osd
rename to roles/ceph/files/plugins/check_ceph_osd
diff --git a/roles/ceph/files/nrpe/check_chrony b/roles/ceph/files/plugins/check_chrony
similarity index 100%
rename from roles/ceph/files/nrpe/check_chrony
rename to roles/ceph/files/plugins/check_chrony
diff --git a/roles/ceph/files/nrpe/check_smartdisk.sh b/roles/ceph/files/plugins/check_smartdisk.sh
similarity index 100%
rename from roles/ceph/files/nrpe/check_smartdisk.sh
rename to roles/ceph/files/plugins/check_smartdisk.sh
diff --git a/roles/ceph/tasks/nrpe.yml b/roles/ceph/tasks/nrpe.yml
index c94df0a..2b87bbe 100644
--- a/roles/ceph/tasks/nrpe.yml
+++ b/roles/ceph/tasks/nrpe.yml
@@ -1,14 +1,14 @@
 - name: Set NRPE Ceph configuration
   copy:
-    src: nrpe.cfg
-    dest: /etc/nagios/nrpe.d/95-ceph.cfg
+    src: nrpe.d/95-ceph.cfg
+    dest: /etc/nagios/nrpe.d/
     owner: root
     group: root
     mode: u=rw,g=r,o=r
   notify: restart-nrpe
 - name: Copy Ceph NRPE plugins
   copy:
-    src: nrpe/
+    src: plugins/
     dest: /etc/nagios/plugins/
     owner: root
     group: root