diff --git a/manifests/nagios/objects/add_contact.pp b/manifests/nagios/objects/add_contact.pp
index a42a0c8..c90f776 100644
--- a/manifests/nagios/objects/add_contact.pp
+++ b/manifests/nagios/objects/add_contact.pp
@@ -28,7 +28,7 @@ define confdroid_nagios::nagios::objects::add_contact (
   $ng_nagios_server       = $confdroid_nagios::params::ng_nagios_server
   $ng_target_add_contact  = $confdroid_nagios::params::ng_target_add_contact
   $ng_contacts_rule_erb   = $confdroid_nagios::params::ng_contacts_rule_erb
-  $fqdn                   = $facts['networking']['fqdn']
+  $fqdn                   = $confdroid_nagios::params::fqdn
 
   if $ng_nagios_server == $fqdn {
     concat::fragment { $name:
diff --git a/manifests/nagios/objects/add_contactgroups.pp b/manifests/nagios/objects/add_contactgroups.pp
index cf9a611..56a6106 100644
--- a/manifests/nagios/objects/add_contactgroups.pp
+++ b/manifests/nagios/objects/add_contactgroups.pp
@@ -23,7 +23,7 @@ define confdroid_nagios::nagios::objects::add_contactgroups (
   $ng_nagios_server         = $confdroid_nagios::params::ng_nagios_server
   $ng_tgt_contactgroup_add  = $confdroid_nagios::params::ng_tgt_contactgroup_add
   $ng_cntctgrps_rule_erb    = $confdroid_nagios::params::ng_cntctgrps_rule_erb
-  $fqdn                     = $facts['networking']['fqdn']
+  $fqdn                     = $confdroid_nagios::params::fqdn
 
   if $ng_nagios_server == $fqdn {
     concat::fragment { $name:
diff --git a/manifests/nagios/objects/add_hostgroups.pp b/manifests/nagios/objects/add_hostgroups.pp
index 5ec2cda..c9cfafb 100644
--- a/manifests/nagios/objects/add_hostgroups.pp
+++ b/manifests/nagios/objects/add_hostgroups.pp
@@ -22,7 +22,7 @@ define confdroid_nagios::nagios::objects::add_hostgroups (
   $ng_nagios_server         = $confdroid_nagios::params::ng_nagios_server
   $ng_tgt_hostgroup_add     = $confdroid_nagios::params::ng_tgt_hostgroup_add
   $ng_tgt_hostgrp_rule_erb  = $confdroid_nagios::params::ng_tgt_hostgrp_rule_erb
-  $fqdn                     = $facts['networking']['fqdn']
+  $fqdn                     = $confdroid_nagios::params::fqdn
 
   if $ng_nagios_server == $fqdn {
     concat::fragment { $name:
diff --git a/manifests/nagios/objects/add_servicegroups.pp b/manifests/nagios/objects/add_servicegroups.pp
index a668714..09b30fc 100644
--- a/manifests/nagios/objects/add_servicegroups.pp
+++ b/manifests/nagios/objects/add_servicegroups.pp
@@ -25,7 +25,7 @@ define confdroid_nagios::nagios::objects::add_servicegroups (
   $ng_nagios_server         = $confdroid_nagios::params::ng_nagios_server
   $ng_tgt_servicegroup_add  = $confdroid_nagios::params::ng_tgt_servicegroup_add
   $ng_tgt_svcgrp_rule_erb   = $confdroid_nagios::params::ng_tgt_svcgrp_rule_erb
-  $fqdn                     = $facts['networking']['fqdn']
+  $fqdn                     = $confdroid_nagios::params::fqdn
 
   if $ng_nagios_server == $fqdn {
     concat::fragment { $name:
diff --git a/manifests/nagios/objects/add_timeperiods.pp b/manifests/nagios/objects/add_timeperiods.pp
index aa8b537..c1cf5f5 100644
--- a/manifests/nagios/objects/add_timeperiods.pp
+++ b/manifests/nagios/objects/add_timeperiods.pp
@@ -5,8 +5,8 @@
 #   external Puppet rules.
 # @example
 #   confdroid_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
-#     ng_timep_name   => 'example_timeperiod',
-#     ng_timep_alias  => 'Example timeperiod',
+#     ng_timep_name        => 'example_timeperiod',
+#     ng_timep_alias       => 'Example timeperiod',
 #     ng_timep_monday      => '00:00-00:00',
 #     ng_timep_tuesday     => '00:00-00:00',
 #     ng_timep_wednesday   => '00:00-00:00',
@@ -29,19 +29,19 @@ define confdroid_nagios::nagios::objects::add_timeperiods (
 
   Optional[String] $ng_timep_name       = undef,
   Optional[String] $ng_timep_alias      = undef,
-  String $ng_timep_monday               = '00:00-00:00',
-  String $ng_timep_tuesday              = '00:00-00:00',
-  String $ng_timep_wednesday            = '00:00-00:00',
-  String $ng_timep_thursday             = '00:00-00:00',
-  String $ng_timep_friday               = '00:00-00:00',
-  String $ng_timep_saturday             = '00:00-00:00',
-  String $ng_timep_sunday               = '00:00-00:00',
+  String $ng_timep_monday               = '00:00-24:00',
+  String $ng_timep_tuesday              = '00:00-24:00',
+  String $ng_timep_wednesday            = '00:00-24:00',
+  String $ng_timep_thursday             = '00:00-24:00',
+  String $ng_timep_friday               = '00:00-24:00',
+  String $ng_timep_saturday             = '00:00-24:00',
+  String $ng_timep_sunday               = '00:00-24:00',
 
 ) {
   $ng_nagios_server         = $confdroid_nagios::params::ng_nagios_server
   $ng_tgt_timep_add         = $confdroid_nagios::params::ng_tgt_timep_add
   $ng_tgt_timep_rule_erb    = $confdroid_nagios::params::ng_tgt_timep_rule_erb
-  $fqdn                     = $facts['network']['fqdn']
+  $fqdn                     = $confdroid_nagios::params::fqdn
 
   if $ng_nagios_server == $fqdn {
     concat::fragment { $name: