diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index ec0e7bcf..3784985f 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -909,6 +909,12 @@ class nagios_monitor {
       description    => 'Scriptherder Status',
       contact_groups => ['alerts']
    }
+   nagioscfg::service {'check_apt':
+      hostgroup_name => ['nrpe'],
+      check_command  => 'check_nrpe_1arg!check_apt',
+      description    => 'Packages available for upgrade',
+      contact_groups => ['alerts']
+   }
    nagioscfg::service {'metadata_aggregate_age':
       hostgroup_name => ['md_publisher'],
       check_command  => 'check_nrpe_1arg!check_fileage_metadata_aggregate',
@@ -932,6 +938,27 @@ class nagios_monitor {
       description    => 'check https certificate validity on port 443',
       contact_groups => ['alerts']
    }
+   nagioscfg::command {'check_website':
+      command_line   => "/usr/lib/nagios/plugins/check_http -H '\$HOSTNAME\$' -S -u '\$ARG1\$'"
+   }
+   nagioscfg::service {'check_metadata_eIDAS':
+      host_name      => ['md.eidas.swedenconnect.se'],
+      check_command  => 'check_website!https://md.eidas.swedenconnect.se/',
+      description    => 'check metadata for eIDAS',
+      contact_groups => ['alerts'],
+   }
+   nagioscfg::service {'check_metadata_swedenconnect':
+      host_name      => ['md.swedenconnect.se'],
+      check_command  => 'check_website!https://md.swedenconnect.se/',
+      description    => 'check metadata for Sweden Connect',
+      contact_groups => ['alerts'],
+  }
+  nagioscfg::service {'check_connector':
+      host_name      => ['connector.eidas.swedenconnect.se'],
+      check_command  => 'check_website!https://connector.eidas.swedenconnect.se/idp/metadata/sp',
+      description    => 'check metadata for Sweden Connect',
+      contact_groups => ['alerts'],
+   }
 }
 
 class redis_cluster_node {