diff --git a/manifests/monitoring/target.pp b/manifests/monitoring/target.pp
index 559ded4..3ddc372 100644
--- a/manifests/monitoring/target.pp
+++ b/manifests/monitoring/target.pp
@@ -10,12 +10,12 @@ class confdroid_apache::monitoring::target (
     false: { notify { 'Nagios Service target for check_httpd has been disabled via parameters / ENC override': }
     }
     default: {
-      @@nagios_service { "check_http_${::hostname}":
+      @@nagios_service { "check_http_${fqdn}":
         check_command       => 'check_http',
         use                 => 'generic-service',
-        host_name           => $::fqdn,
+        host_name           => $fqdn,
         notification_period => '24x7',
-        service_description => "${::hostname}_check_http",
+        service_description => "${fqdn}_check_http",
         target              => $ae_target_service,
         owner               => 'nagios',
         group               => 'nagios',
diff --git a/manifests/params.pp b/manifests/params.pp
index 0432237..2eee3ef 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -55,7 +55,7 @@ class confdroid_apache::params (
   Boolean $ae_allow_user_dirs = false,
 
 # nagios
-  Boolean $ae_incl_target     = true,
+  Boolean $ae_incl_target     = false,
   String $ae_target_service  = '/etc/nagios/conf.d/httpd_service.cfg',
 
 # firewall
@@ -65,6 +65,12 @@ class confdroid_apache::params (
   String $ae_https_port      = '443',
 
 ) {
+# facts
+  $fqdn                             = $facts['networking']['fqdn']
+  $domain                           = $facts['networking']['domain']
+  $os_name                          = $facts['os']['name']
+  $os_release                       = $facts['os']['release']['major']
+
 # service
   $ae_service         = 'httpd'