diff --git a/templates/nrpe.cfg.j2 b/templates/nrpe.cfg.j2
index 18b0044..5801044 100644
--- a/templates/nrpe.cfg.j2
+++ b/templates/nrpe.cfg.j2
@@ -98,7 +98,7 @@ server_port=5666
 #
 # NOTE: This option is ignored if NRPE is running under either inetd or xinetd
 
-allowed_hosts={{ nagios_host }},monitor.p0m.fr,2a01:e0a:518:830::10
+allowed_hosts={{ nagios_host }},monitor.p0m.fr,2a01:e0a:518:830::a
 
 
 
@@ -296,8 +296,8 @@ command[check_disks]=/usr/lib/nagios/plugins/check_disk -w 16% -c 9% -A{% for nr
 
 command[check_hda1]=/usr/lib/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1
 command[check_zombie_procs]=/usr/lib/nagios/plugins/check_procs -w 5 -c 10 -s Z
-command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w {{ (nrpe_check_total_procs * 0.9) | int }} -c {{ nrpe_check_total_procs }}
-{% if inventory_hostname == 'aton.ra.nemunai.re' %}
+command[check_total_procs]=/usr/lib/nagios/plugins/check_procs -w {{ nrpe_check_total_procs * 0.9 | int }} -c {{ nrpe_check_total_procs }}
+{% if inventory_hostname == 'hesat.ra.nemunai.re' %}
 command[check_ntp_time]=/usr/lib/nagios/plugins/check_ntp_time -H fr.pool.ntp.org -w 1 -c 2
 {% else %}
 command[check_ntp_time]=/usr/lib/nagios/plugins/check_ntp_time -H {{ ntp_pool[0] }} -w 1 -c 2
diff --git a/templates/server.cfg.j2 b/templates/server.cfg.j2
index 5ec0a78..631817c 100644
--- a/templates/server.cfg.j2
+++ b/templates/server.cfg.j2
@@ -2,7 +2,7 @@ define host {
     use                 linux-server
     host_name           {{ inventory_hostname_short }}
     address             {{ inventory_hostname }}
-    hostgroups          linux-servers,{{ ansible_distribution | lower }}-hosts{% if group_names | length > 0 %},{{ group_names | join(",") }}{% endif %}{% if nagios_extra_groups | length > 0 %},{{ nagios_extra_groups | join(",") }}{% endif %}
+    hostgroups          linux-servers{% if group_names | length > 0 %},{{ group_names | join(",") }}{% endif %}{% if nagios_extra_groups | length > 0 %},{{ nagios_extra_groups | join(",") }}{% endif %}
 
 {% if mydomain is defined and mydomain != "ra.nemunai.re" -%}
 {% set dn = mydomain.split('.') %}