diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index d8e50a63..7efb0e65 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1386,10 +1386,12 @@ eumdsigner-test-sto3-1.komreg.net:
       path: '/var/cache/metadata_r1.komreg.net'
 
 '^lb-test-.+-\d+\.komreg\.net$':
+   autoupdate:
    sunet::dockerhost2:
    sunet::lb::load_balancer:
       interface: 'ens3'
    sunet::fleetlock_client:
+   fe_servers:
 
 log-test-sto3-1.komreg.net:
    autoupdate:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 374a92a0..90d64b53 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -883,8 +883,14 @@ class nrpe {
   sunet::nagios::nrpe_command {'check_entropy':
     command_line => '/usr/lib/nagios/plugins/check_entropy -w 200'
   }
-  sunet::nagios::nrpe_command {'check_ntp_time':
-    command_line => '/usr/lib/nagios/plugins/check_ntp_time -H localhost'
+  if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '22.04') > 0 ){
+    sunet::nagios::nrpe_command {'check_ntp_time':
+      command_line => '/usr/lib/nagios/plugins/check_ntp_time -H ntp.se'
+    }
+  } else {
+      sunet::nagios::nrpe_command {'check_ntp_time':
+        command_line => '/usr/lib/nagios/plugins/check_ntp_time -H localhost'
+      }
   }
   sunet::nagios::nrpe_command {'check_scriptherder':
     command_line => '/usr/local/bin/scriptherder --mode check'