diff --git a/manifests/server/nagios.pp b/manifests/server/nagios.pp
index 8778ca1..a07bfaa 100644
--- a/manifests/server/nagios.pp
+++ b/manifests/server/nagios.pp
@@ -27,7 +27,7 @@ class confdroid_nagios::server::nagios (
     @@nagios_service { 'check_nagios_localhost':
       check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
       use                 => 'generic-service',
-      host_name           => 'localhost',
+      host_name           => "localhost_${fqdn}",
       notification_period => '24x7',
       service_description => 'localhost_nagios_service',
       target              => $ng_target_service,
@@ -42,7 +42,7 @@ class confdroid_nagios::server::nagios (
       ensure              => $ng_disk_ensure,
       check_command       => "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
       use                 => 'generic-service',
-      host_name           => 'localhost',
+      host_name           => "localhost_${fqdn}",
       contacts            => $ng_contact_name,
       notification_period => '24x7',
       service_description => 'localhost_root_partition',
@@ -59,7 +59,7 @@ class confdroid_nagios::server::nagios (
         ensure              => $ng_swap_ensure,
         check_command       => "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
         use                 => 'generic-service',
-        host_name           => 'localhost',
+        host_name           => "localhost_${fqdn}",
         contacts            => $ng_contact_name,
         notification_period => '24x7',
         service_description => 'localhost_swap_usage',
@@ -76,7 +76,7 @@ class confdroid_nagios::server::nagios (
       ensure              => $ng_users_ensure,
       check_command       => "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
       use                 => 'generic-service',
-      host_name           => 'localhost',
+      host_name           => "localhost_${fqdn}",
       contacts            => $ng_contact_name,
       notification_period => '24x7',
       service_description => 'localhost_local_users',
@@ -92,7 +92,7 @@ class confdroid_nagios::server::nagios (
       ensure              => $ng_procs_tot_ensure,
       check_command       => "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
       use                 => 'generic-service',
-      host_name           => 'localhost',
+      host_name           => "localhost_${fqdn}",
       contacts            => $ng_contact_name,
       notification_period => '24x7',
       service_description => 'localhost_total_processes',
@@ -108,7 +108,7 @@ class confdroid_nagios::server::nagios (
       ensure              => $ng_procs_z_ensure,
       check_command       => "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
       use                 => 'generic-service',
-      host_name           => 'localhost',
+      host_name           => "localhost_${fqdn}",
       contacts            => $ng_contact_name,
       notification_period => '24x7',
       service_description => 'localhost_zombie_processes',
@@ -124,7 +124,7 @@ class confdroid_nagios::server::nagios (
       ensure              => $ng_load_ensure,
       check_command       => "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
       use                 => 'generic-service',
-      host_name           => 'localhost',
+      host_name           => "localhost_${fqdn}",
       contacts            => $ng_contact_name,
       notification_period => '24x7',
       service_description => 'localhost_current_load',