diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 149e03fb..49110ef9 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -1434,21 +1434,39 @@ class nagios_monitor {
   nagioscfg::command {'check_metadata_age':
       command_line   => "/usr/lib/nagios/plugins/check_eidas_metadata_age.sh '\$ARG1\$' '\$ARG2\$' '\$ARG3\$'"
   }
-  $hosts_md = ['qa.md.swedenconnect.se', 'md.swedenconnect.se']
+  $hosts_md = ['qa.md.swedenconnect.se', 'md.swedenconnect.se', 'test.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",
-      description    => "check metadata for ${host}",
+      description    => "check metadata age for ${host}",
       contact_groups => ['alerts'],
     }
   }
-  $hosts_md_eidas = ['md.eidas.swedenconnect.se', 'qa.md.eidas.swedenconnect.se']
+  $hosts_md_eidas = ['md.eidas.swedenconnect.se', 'qa.md.eidas.swedenconnect.se', 'test.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/!432000!86400",
-      description    => "check metadata for ${host}",
+      description    => "check metadata age for ${host}",
+      contact_groups => ['alerts'],
+    }
+  }
+  $hosts_proxy = ['proxy.eidas.swedenconnect.se', 'qa.proxy.eidas.swedenconnect.se', 'test.proxy.eidas.swedenconnect.se']
+  $hosts_proxy.each |$host|{
+    nagioscfg::service {"check_metadata_age_${host}":
+      host_name      => ["${host}"],
+      check_command  => "check_metadata_age!https://${host}/eidas-ps/ServiceMetadata/!432000!86400",
+      description    => "check metadata age for ${host}",
+      contact_groups => ['alerts'],
+    }
+  }
+  $hosts_demw = ['demw.eidas.swedenconnect.se', 'qa.demw.eidas.swedenconnect.se']
+  $hosts_demw.each |$host|{
+    nagioscfg::service {"check_metadata_age_${host}":
+      host_name      => ["${host}"],
+      check_command  => "check_metadata_age!https://${host}/eidas-middleware/Metadata/!432000!86400",
+      description    => "check metadata age for ${host}",
       contact_groups => ['alerts'],
     }
   }