diff --git a/servers/puppet/modules/humbug/files/nagios3/conf.d/generic-service_nagios2.cfg b/servers/puppet/modules/humbug/files/nagios3/conf.d/generic-service_nagios2.cfg
index 9b7c22444e..0312fc59ea 100644
--- a/servers/puppet/modules/humbug/files/nagios3/conf.d/generic-service_nagios2.cfg
+++ b/servers/puppet/modules/humbug/files/nagios3/conf.d/generic-service_nagios2.cfg
@@ -16,9 +16,9 @@ define service{
                 notification_interval           0               ; Only send notifications on status change by default.
                 is_volatile                     0
                 check_period                    24x7
-                normal_check_interval           5
+                normal_check_interval           1
                 retry_check_interval            1
-                max_check_attempts              4
+                max_check_attempts              2
                 notification_period             24x7
                 notification_options            w,u,c,r
                 contact_groups                  admins
diff --git a/servers/puppet/modules/humbug/files/nagios3/conf.d/services.cfg b/servers/puppet/modules/humbug/files/nagios3/conf.d/services.cfg
index 91f110c621..feb40289d1 100644
--- a/servers/puppet/modules/humbug/files/nagios3/conf.d/services.cfg
+++ b/servers/puppet/modules/humbug/files/nagios3/conf.d/services.cfg
@@ -48,9 +48,6 @@ define service {
         service_description             user zephyr mirror liveness
         check_command                   check_user_zephyr_mirror_liveness!22
         host                            app
-        normal_check_interval           2
-        retry_check_interval            1
-        max_check_attempts              2
         contact_groups                  admins
 }
 
@@ -59,7 +56,6 @@ define service {
         service_description             Debian update availability
         check_command                   check_debian_packages!22
         hostgroup_name                  all
-        max_check_attempts              1
         contact_groups                  admins
 }