diff --git a/CHANGELOG.md b/CHANGELOG.md
index b10b99fb..fa543bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The **patch** part changes incrmentally at each release.
 
 ### Added
 * mongodb: install python-pymongo for monitoring
+* nagios-nrpe: allowed_hosts can be updated
 
 ### Changed
 * Changelog: explain the versioning scheme
diff --git a/nagios-nrpe/defaults/main.yml b/nagios-nrpe/defaults/main.yml
index 4a1eb1c0..5834c4a2 100644
--- a/nagios-nrpe/defaults/main.yml
+++ b/nagios-nrpe/defaults/main.yml
@@ -7,6 +7,8 @@ nagios_nrpe_ldap_passwd: LDAP_PASSWD
 nagios_nrpe_pgsql_passwd: PGSQL_PASSWD
 nagios_nrpe_amavis_from: "foobar@{{ ansible_domain }}"
 
+nagios_nrpe_force_update_allowed_hosts: False
+
 nagios_nrpe_check_proxy_host: "www.example.com"
 
 nagios_plugins_directory: "/usr/local/lib/nagios/plugins"
diff --git a/nagios-nrpe/tasks/main.yml b/nagios-nrpe/tasks/main.yml
index d0298c6c..feeaff8e 100644
--- a/nagios-nrpe/tasks/main.yml
+++ b/nagios-nrpe/tasks/main.yml
@@ -10,6 +10,8 @@
     - nagios-plugins-common
     - nagios-plugins-contrib
     - nagios-plugins-standard
+  tags:
+    - nagios-nrpe
 
 - name: custom configuration is present
   template:
@@ -19,6 +21,19 @@
     mode: "0640"
     force: no
   notify: restart nagios-nrpe-server
+  tags:
+    - nagios-nrpe
+
+- name: update allowed_hosts lists
+  lineinfile:
+    dest: /etc/nagios/nrpe.d/evolix.cfg
+    line: "allowed_hosts={{ nagios_nrpe_allowed_hosts | join(',') }}"
+    regexp: '^allowed_hosts='
+    insertafter: '# Allowed IPs'
+  notify: restart nagios-nrpe-server
+  when: nagios_nrpe_force_update_allowed_hosts
+  tags:
+    - nagios-nrpe
 
 - name: Nagios config is secured
   file:
@@ -27,12 +42,15 @@
     group: nagios
     state: directory
   notify: restart nagios-nrpe-server
+  tags:
+    - nagios-nrpe
 
 - include_role:
     name: remount-usr
   when: nagios_plugins_directory | search ("/usr")
   tags:
-  - nagios-plugins
+    - nagios-nrpe
+    - nagios-plugins
 
 - name: Nagios plugins are installed
   copy:
@@ -41,6 +59,7 @@
     mode: "0755"
   notify: restart nagios-nrpe-server
   tags:
+  - nagios-nrpe
   - nagios-plugins
 
 - name: Nagios lib is secured
@@ -51,3 +70,5 @@
     recurse: yes
     state: directory
   notify: restart nagios-nrpe-server
+  tags:
+    - nagios-nrpe