diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 9b867bd4..757487f6 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -447,6 +447,15 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
+  eumd-test-1.komreg.net:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    nrpe: null
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunetops: null
   eupub-1.komreg.net:
     autoupdate: null
     common: null
@@ -1440,10 +1449,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1480,10 +1489,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1534,10 +1543,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1559,10 +1568,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1594,10 +1603,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1628,10 +1637,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1676,10 +1685,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.sveidas.se, log-1.test.sveidas.se, log-1.test.sveidas.se,
@@ -1699,19 +1708,20 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-fre-3.komreg.net,
-    jump-tug-3.komreg.net, jump-tug-3.komreg.net, 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, 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,
-    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-1.test.sveidas.se, prid-2.sveidas.se,
-    prid-2.test.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-1.test.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, jump-tug-3.komreg.net,
+    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,
+    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, 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-1.test.sveidas.se, prid-2.sveidas.se, prid-2.test.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-1.test.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se,
     eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.test.sveidas.se,
@@ -1728,10 +1738,10 @@ 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, eupub-1.komreg.net,
-    eupub-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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,