diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
index 00781ae..b3564c3 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -280,23 +280,7 @@
 182
 183
 184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201</pre>
+185</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
@@ -354,28 +338,11 @@ class confdroid_nagios::server::service (
       contacts            =&gt; $ng_contact_name,
     }
 
-    @@nagios_host { $fqdn:
-      ensure              =&gt; $ng_ping_ensure,
-      alias               =&gt; $hostname,
-      address             =&gt; $fqdn,
-      use                 =&gt; &#39;linux-server&#39;,
-      target              =&gt; $ng_target_host,
-      hostgroups          =&gt; &#39;linux-servers&#39;,
-      contacts            =&gt; $ng_contact_name,
-      max_check_attempts  =&gt; $ng_max_check_attempts,
-      notification_period =&gt; &#39;24x7&#39;,
-      owner               =&gt; $ng_user,
-      group               =&gt; $ng_user,
-      mode                =&gt; &#39;0640&#39;,
-      check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
-      notify              =&gt; Service[$ng_user],
-    }
-
-    @@nagios_service { &quot;root_partition_${hostname}&quot;:
+    @@nagios_service { &#39;root_partition_localhost&#39;:
       ensure              =&gt; $ng_disk_ensure,
       check_command       =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
       use                 =&gt; &#39;generic-service&#39;,
-      host_name           =&gt; $fqdn,
+      host_name           =&gt; &#39;localhost&#39;,
       contacts            =&gt; $ng_contact_name,
       notification_period =&gt; &#39;24x7&#39;,
       service_description =&gt; &quot;${hostname}_root_partition&quot;,
@@ -384,17 +351,18 @@ class confdroid_nagios::server::service (
       owner               =&gt; $ng_user,
       group               =&gt; $ng_user,
       mode                =&gt; &#39;0640&#39;,
+      purge               =&gt; $ng_purge_target,
     }
 
     if $ng_enable_swap_check == true {
-      @@nagios_service { &quot;Swap_Usage_${hostname}&quot;:
+      @@nagios_service { &#39;Swap_Usage_localhost&#39;:
         ensure              =&gt; $ng_swap_ensure,
         check_command       =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
         use                 =&gt; &#39;generic-service&#39;,
-        host_name           =&gt; $fqdn,
+        host_name           =&gt; &#39;localhost&#39;,
         contacts            =&gt; $ng_contact_name,
         notification_period =&gt; &#39;24x7&#39;,
-        service_description =&gt; &quot;${hostname}_swap_usage&quot;,
+        service_description =&gt; &#39;localhost_swap_usage&#39;,
         servicegroups       =&gt; &#39;linux-services&#39;,
         target              =&gt; $ng_target_service,
         owner               =&gt; $ng_user,
@@ -403,14 +371,14 @@ class confdroid_nagios::server::service (
       }
     }
 
-    @@nagios_service { &quot;Local_Users_${hostname}&quot;:
+    @@nagios_service { &#39;Local_Users_localhost&#39;:
       ensure              =&gt; $ng_users_ensure,
       check_command       =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
       use                 =&gt; &#39;generic-service&#39;,
-      host_name           =&gt; $fqdn,
+      host_name           =&gt; &#39;localhost&#39;,
       contacts            =&gt; $ng_contact_name,
       notification_period =&gt; &#39;24x7&#39;,
-      service_description =&gt; &quot;${hostname}_local_users&quot;,
+      service_description =&gt; &#39;localhost_local_users&#39;,
       servicegroups       =&gt; &#39;linux-services&#39;,
       target              =&gt; $ng_target_service,
       owner               =&gt; $ng_user,
@@ -418,14 +386,14 @@ class confdroid_nagios::server::service (
       mode                =&gt; &#39;0640&#39;,
     }
 
-    @@nagios_service { &quot;Total Processes_${hostname}&quot;:
+    @@nagios_service { &#39;Total_Processes_localhost&#39;:
       ensure              =&gt; $ng_procs_tot_ens,
       check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
       use                 =&gt; &#39;generic-service&#39;,
-      host_name           =&gt; $fqdn,
+      host_name           =&gt; &#39;localhost&#39;,
       contacts            =&gt; $ng_contact_name,
       notification_period =&gt; &#39;24x7&#39;,
-      service_description =&gt; &quot;${hostname}_total_processes&quot;,
+      service_description =&gt; &#39;localhost_total_processes&#39;,
       servicegroups       =&gt; &#39;linux-services&#39;,
       target              =&gt; $ng_target_service,
       owner               =&gt; $ng_user,
@@ -433,14 +401,14 @@ class confdroid_nagios::server::service (
       mode                =&gt; &#39;0640&#39;,
     }
 
-    @@nagios_service { &quot;Zombie Processes_${hostname}&quot;:
+    @@nagios_service { &#39;Zombie_Processes_localhost&#39;:
       ensure              =&gt; $ng_procs_z_ensure,
       check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
       use                 =&gt; &#39;generic-service&#39;,
-      host_name           =&gt; $fqdn,
+      host_name           =&gt; &#39;localhost&#39;,
       contacts            =&gt; $ng_contact_name,
       notification_period =&gt; &#39;24x7&#39;,
-      service_description =&gt; &quot;${hostname}_zombie_processes&quot;,
+      service_description =&gt; &#39;localhost_zombie_processes&#39;,
       servicegroups       =&gt; &#39;linux-services&#39;,
       target              =&gt; $ng_target_service,
       owner               =&gt; $ng_user,
@@ -448,14 +416,14 @@ class confdroid_nagios::server::service (
       mode                =&gt; &#39;0640&#39;,
     }
 
-    @@nagios_service { &quot;Current_Load_${hostname}&quot;:
+    @@nagios_service { &#39;Current_Load_localhost&#39;:
       ensure              =&gt; $ng_load_ensure,
       check_command       =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
       use                 =&gt; &#39;generic-service&#39;,
-      host_name           =&gt; $fqdn,
+      host_name           =&gt; &#39;localhost&#39;,
       contacts            =&gt; $ng_contact_name,
       notification_period =&gt; &#39;24x7&#39;,
-      service_description =&gt; &quot;${hostname}_current_load&quot;,
+      service_description =&gt; &#39;localhost_current_load&#39;,
       servicegroups       =&gt; &#39;linux-services&#39;,
       target              =&gt; $ng_target_service,
       owner               =&gt; $ng_user,