diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 1ceb2095..230a75a5 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -453,18 +453,25 @@ classes:
   eumd-test-1.komreg.net:
     autoupdate: null
     common: null
+    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
+    konsulter: null
     mailclient: *id001
+    metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
   eumd-test-2.komreg.net:
+    autoupdate: null
     common: null
+    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
+    konsulter: null
     mailclient: *id001
+    metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -509,7 +516,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
-    md_publisher: {keyname: eupub-test.komreg.net_infra}
+    md_publisher: {keyname: eupub-test-1.komreg.net_infra}
     mdsl_publisher: null
     nrpe: null
     sunet::rsyslog: null
@@ -521,7 +528,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
-    md_publisher: {keyname: eupub-test.komreg.net_infra}
+    md_publisher: {keyname: eupub-test-2.komreg.net_infra}
     mdsl_publisher: null
     nrpe: null
     sunet::rsyslog: null
@@ -1506,15 +1513,15 @@ members:
     eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se,
     eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
     eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se,
-    log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net,
-    natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net, natpub-1.komreg.net,
-    natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
-    test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+    log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, monitor-tug-3.komreg.net,
+    natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
+    prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se,
+    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net,
+    validator-2.komreg.net, web-1.qa.sveidas.se]
   common: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
     eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
@@ -1546,13 +1553,14 @@ members:
     eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se,
     eidas-redis-3.sveidas.se, eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se,
     eidas-redis-fe-2.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
-    eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, fe-fre-1.test.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, log-1.sveidas.se,
-    log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net,
-    md1.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
-    natmd-test-1.komreg.net, natmd-test-2.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
-    test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net]
+    eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
+    eumd-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
+    fe-tug-3.komreg.net, log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se,
+    log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-tug-3.komreg.net,
+    natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net,
+    nic.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net,
+    refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-1.qa.komreg.net, validator-2.komreg.net]
   eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net]
@@ -1625,12 +1633,12 @@ members:
     eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
     eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se,
     eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net,
-    eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    log-1.sveidas.se, log-2.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net,
-    natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net, nic.komreg.net,
-    prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, refidp-1.qa.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net]
+    eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se,
+    md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
+    natmd-test-1.komreg.net, natmd-test-2.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se,
+    prid-1.sveidas.se, prid-2.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
+    test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net]
   mailclient: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
     eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se,
@@ -1664,9 +1672,10 @@ members:
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
     eupub-test-2.komreg.net, p2.qa.komreg.net]
-  metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net,
-    natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
+  metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net,
+    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net,
+    md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net]
   nagios_monitor: [monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, nic.komreg.net]
   nrpe: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,