diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 41da8dc8..70b4b589 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -923,6 +923,8 @@ class nagios_monitor {
    $allowed_hosts = join($nrpe_clients," ");
    $web_admin_pw   = safe_hiera('nagios_nagiosadmin_password');
    $web_admin_user = 'nagiosadmin';
+
+   package { 'libxml2-utils': ensure => installed}
    
    class { 'webserver': }
    class { 'nagioscfg':
@@ -1109,19 +1111,34 @@ class nagios_monitor {
       check_command  => 'check_website!https://md.swedenconnect.se/',
       description    => 'check metadata for Sweden Connect',
       contact_groups => ['alerts'],
-  }
-  nagioscfg::service {'check_connector':
+   }
+   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'],
    }
-  nagioscfg::service {'check_metadata_DE_middleware':
+   nagioscfg::service {'check_metadata_DE_middleware':
       host_name      => ['demw.eidas.swedenconnect.se'],
       check_command  => 'check_website!https://demw.eidas.swedenconnect.se/eidas-middleware/Metadata',
       description    => 'check metadata for DE middleware',
       contact_groups => ['alerts'],
    }
+   nagioscfg::command {'check_country_count':
+      command_line   => "/usr/lib/nagios/plugins/check_eidas_country_count.sh '\$ARG1\$' '\$ARG2\$' '\$ARG3\$' '\$ARG4\$'"
+   }
+   nagioscfg::service {'check_country_eIDAS_QA':
+      host_name      => ['qa.md.eidas.swedenconnect.se'],
+      check_command  => 'check_country_count!qa.md.eidas.swedenconnect.se!23!2!3',
+      description    => 'check number of countries in eIDAS QA',
+      contact_groups => ['alerts'],
+   }
+   nagioscfg::service {'check_country_eIDAS':
+      host_name      => ['md.eidas.swedenconnect.se'],
+      check_command  => 'check_country_count!md.eidas.swedenconnect.se!8!1!2',
+      description    => 'check number of countries in eIDAS',
+      contact_groups => ['alerts'],
+   }
 }
 
 class redis_cluster_node {