diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index b339635b..744b9656 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -853,7 +853,7 @@ test-1.test.sveidas.se:
    konsulter:
    autoupdate:
    eidas_de_middleware:
-      version: 320-sc-p11_hsm2
+      version: 320-sc_hsm2
       hostname: qa.demw.eidas.swedenconnect.se
    webserver:
       enabled: true
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
index 43d6efdb..bfffc7fe 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/nagios_monitor.pp
@@ -451,11 +451,11 @@ class eid::nagios_monitor {
       contact_groups => ['alerts'],
     }
   }
-  $hosts_demw = ['demw.eidas.swedenconnect.se', 'qa.demw.eidas.swedenconnect.se']
+  $hosts_demw = ['demw.eidas.swedenconnect.se', 'qa.demw.eidas.swedenconnect.se', 'test.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",
+      check_command  => "check_metadata_age!https://${host}/eidas-middleware/Metadata!432000!86400",
       description    => "check metadata age for ${host}",
       contact_groups => ['alerts'],
     }