diff --git a/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2 b/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2
index 58c5c48..3885458 100644
--- a/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2
+++ b/roles/icinga2_master/templates/zones.d/master/hosts.conf.j2
@@ -3,6 +3,9 @@
 object Host "{{ icinga2_master }}" {
     import "generic-host"
     address = "{{ hostvars[icinga2_master].ipv4_addr }}"
+{% if icinga2_master == 'lime2' %}
+    vars.apt_timeout = 45
+{% endif %}
 {% if hostvars[icinga2_master].smart_devices is defined %}
 {% for device in hostvars[icinga2_master].smart_devices %}
     vars.smart_devices["smart::{{ device }}"] = {
@@ -15,6 +18,9 @@ object Host "{{ icinga2_master }}" {
 object Host "{{ icinga2_agent }}" {
     import "generic-host"
     address = "{{ hostvars[icinga2_agent].ipv4_addr }}"
+{% if icinga2_agent == 'lime2' %}
+    vars.apt_timeout = 45
+{% endif %}
 {% if hostvars[icinga2_agent].smart_devices is defined %}
 {% for device in hostvars[icinga2_agent].smart_devices %}
     vars.smart_devices["smart::{{ device }}"] = {
diff --git a/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2 b/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2
index 56a79df..4d631c1 100644
--- a/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2
+++ b/roles/icinga2_master/templates/zones.d/master/services/common.conf.j2
@@ -34,6 +34,7 @@ apply Service "disk" {
 apply Service "apt" {
     import "generic-service"
     check_command = "apt"
+    check_interval = 1d
     command_endpoint = host.name
     assign where true
 }