diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 72d486b1..717e9302 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -1150,8 +1150,8 @@ class nagios_monitor {
   nagioscfg::command {'check_metadata_age':
       command_line   => "/usr/lib/nagios/plugins/check_eidas_metadata_age.sh '\$ARG1\$' '\$ARG2\$' '\$ARG3\$'"
   }
-  $hosts = ['qa.md.swedenconnect.se', 'md.swedenconnect.se', 'md.eidas.swedenconnect.se', 'qa.md.eidas.swedenconnect.se']
-  $hosts.each |$host|{
+  $hosts_md = ['qa.md.swedenconnect.se', 'md.swedenconnect.se']
+  $hosts_md.each |$host|{
     nagioscfg::service {"check_metadata_age_${host}":
       host_name      => ["${host}"],
       check_command  => "check_metadata_age!https://${host}/entities!691200!172800",
@@ -1159,6 +1159,15 @@ class nagios_monitor {
       contact_groups => ['alerts'],
     }
   }
+  $hosts_md_eidas = ['md.eidas.swedenconnect.se', 'qa.md.eidas.swedenconnect.se']
+  $hosts_md_eidas.each |$host|{
+    nagioscfg::service {"check_metadata_age_${host}":
+      host_name      => ["${host}"],
+      check_command  => "check_metadata_age!https://${host}/entities!518400!172800",
+      description    => "check metadata for ${host}",
+      contact_groups => ['alerts'],
+    }
+  }
 }
 
 class redis_cluster_node {
@@ -1183,4 +1192,4 @@ class redis_frontend_node ($hostname=undef,$ca="infra") {
       client_ca     => "/etc/ssl/certs/${ca}.crt",
       certificate   => "/etc/ssl/private/${::fqdn}_${ca}.pem"
     }
-}
\ No newline at end of file
+}