diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index fa6f9a39..81ac5bc2 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -1242,7 +1242,7 @@ class nagios_monitor {
   nagioscfg::command {'check_ssl_cert_3_without_ocsp':
     command_line   => "/usr/lib/nagios/plugins/check_ssl_cert -A -H '\$HOSTNAME\$' --ignore-ocsp -c '\$ARG2\$' -w '\$ARG1\$' -p '\$ARG3\$'"
   }
-  $public_hosts = ['proxy.eidas.swedenconnect.se','validator.swedenconnect.se','qa.demw.eidas.swedenconnect.se','demw.eidas.swedenconnect.se','api.swedenconnect.se','qa.test.swedenconnect.se','test.swedenconnect.se','qa.md.swedenconnect.se','md.swedenconnect.se','md.eidas.swedenconnect.se','qa.md.eidas.swedenconnect.se','qa.connector.eidas.swedenconnect.se','qa.proxy.eidas.swedenconnect.se','connector.eidas.swedenconnect.se','test.connector.eidas.swedenconnect.se']
+  $public_hosts = ['proxy.eidas.swedenconnect.se','validator.swedenconnect.se','qa.demw.eidas.swedenconnect.se','demw.eidas.swedenconnect.se','api.swedenconnect.se','qa.test.swedenconnect.se','test.swedenconnect.se','qa.md.swedenconnect.se','md.swedenconnect.se','md.eidas.swedenconnect.se','qa.md.eidas.swedenconnect.se','qa.connector.eidas.swedenconnect.se','qa.proxy.eidas.swedenconnect.se','connector.eidas.swedenconnect.se','test.connector.eidas.swedenconnect.se','test.test.swedenconnect.se','test.proxy.eidas.swedenconnect.se','test.md.eidas.swedenconnect.se','test.md.swedenconnect.se','test.validator.swedenconnect.se']
   nagioscfg::host {$public_hosts: }
   nagioscfg::service {'check_public_ssl_cert':
       host_name      => $public_hosts,
@@ -1342,6 +1342,36 @@ class nagios_monitor {
       description    => 'check metadata for Proxy',
       contact_groups => ['alerts'],
   }
+  nagioscfg::service {'check_ref_idp_test':
+      host_name      => ['test.test.swedenconnect.se'],
+      check_command  => 'check_website!https://test.test.swedenconnect.se/idp/metadata/idp.xml',
+      description    => 'check Reference IdP',
+      contact_groups => ['alerts'],
+  }
+  nagioscfg::service {'check_mdservicelist_metadata_eIDAS_Test':
+      host_name      => ['test.md.eidas.swedenconnect.se'],
+      check_command  => 'check_website!https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml/',
+      description    => 'check MDSservicelist metadata for eIDAS',
+      contact_groups => ['alerts'],
+  }
+  nagioscfg::service {'check_sp_metadata_swedenconnect_Test':
+      host_name      => ['test.md.swedenconnect.se'],
+      check_command  => 'check_website!https://test.md.swedenconnect.se/role/sp.xml/',
+      description    => 'check SP metadata for Sweden Connect',
+      contact_groups => ['alerts'],
+  }
+  nagioscfg::service {'check_connector_Test':
+      host_name      => ['test.connector.eidas.swedenconnect.se'],
+      check_command  => 'check_website!https://test.connector.eidas.swedenconnect.se/idp/metadata/sp',
+      description    => 'check metadata for Sweden Connect',
+      contact_groups => ['alerts'],
+  }
+  nagioscfg::service {'check_metadata_proxy_Test':
+      host_name      => ['test.proxy.eidas.swedenconnect.se'],
+      check_command  => 'check_website!https://test.proxy.eidas.swedenconnect.se/eidas-ps/ServiceMetadata',
+      description    => 'check metadata for Proxy',
+      contact_groups => ['alerts'],
+  }
   nagioscfg::command {'check_country_count':
       command_line   => "/usr/lib/nagios/plugins/check_eidas_country_count.sh '\$ARG1\$' '\$ARG2\$' '\$ARG3\$' '\$ARG4\$'"
   }