diff --git a/roles/pips/tasks/nagios_tasks.yml b/roles/pips/tasks/nagios_tasks.yml
index 9cdf1e8..9abab36 100644
--- a/roles/pips/tasks/nagios_tasks.yml
+++ b/roles/pips/tasks/nagios_tasks.yml
@@ -18,26 +18,26 @@
       {% endif %}
 
 
-#- name: Check if nagios NRPE  is installed
-#  debug:
-#    msg: "NRPE is installed."
-#  when: "'{{ nrpe_package }}' in ansible_facts.packages"
+- name: Check if nagios NRPE  is installed
+  debug:
+    msg: "NRPE is installed."
+  when: "'{{ nrpe_package }}' in ansible_facts.packages"
 
 - name: Ensure NRPE is installed (Debian/Ubuntu)
   apt:
-    name: nagios-nrpe-plugin
+    name: {{ nrpe_package }}
     state: present
   become: true
   register: nrpe_install_result
-  when: "{{ ansible_facts['os_family'] }} == 'Debian' and ('{{ nrpe_package }}' not in ansible_facts.packages) "
+  when: "{{ ansible_facts['os_family'] }} == 'Debian' "
 
 - name: Ensure NRPE is installed (RedHat/CentOS)
   yum:
-    name: nagios-plugins-nrpe.x86_64 
+    name: {{ nrpe_package }} 
     state: present
   become: yes
   register: nrpe_install_result
-  when: "{{ ansible_facts['os_family'] }} == 'RedHat' and ('{{ nrpe_package }}' not in ansible_facts.packages) "
+  when: "{{ ansible_facts['os_family'] }} == 'RedHat' "
 
 - name: Ensure NRPE is installed (FreeBSD)
   ansible.builtin.pkgng:
@@ -47,7 +47,7 @@
   register: nrpe_install_result
   when:
     - ansible_facts['os_family'] == 'FreeBSD'
-    - not nrpe_installed
+
 
 - name: Set psutil_installed fact if any package name contains "psutil"
   ansible.builtin.set_fact: