diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index b72d0c16..dba64e4e 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1440,19 +1440,6 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
     validator: {version: 3.0.10}
-  validator-1.test.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
-    nrpe: null
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunet_iaas_cloud: null
-    sunetops: null
   validator-2.komreg.net:
     autoupdate: null
     common: null
@@ -1509,8 +1496,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   autoupdate: [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,
@@ -1528,8 +1514,7 @@ members:
     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-test.komreg.net,
-    validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net,
-    validator-2.komreg.net, web-1.qa.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,
@@ -1551,8 +1536,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   eid::dockerhost: [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,
@@ -1569,7 +1553,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-1.test.komreg.net, validator-2.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]
@@ -1607,8 +1591,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   fe_servers: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
     fe-tug-3.komreg.net]
   github_client_credential: [web-1.qa.sveidas.se]
@@ -1633,8 +1616,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net]
   konsulter: [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,
@@ -1648,7 +1630,7 @@ members:
     prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-1.test.sveidas.se, prid-2.sveidas.se,
     prid-2.test.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se,
     validator-1-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-1.test.komreg.net, validator-2.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,
@@ -1670,8 +1652,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net,
     natpub-test-1-komreg.net, p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
@@ -1706,8 +1687,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [web-1.qa.sveidas.se]
   pages: [web-1.qa.sveidas.se]
   prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se]
@@ -1757,8 +1737,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   sunet::server: [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,
@@ -1781,15 +1760,14 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.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,
     eidas-proxy-2.test.sveidas.se, eidastest-1.qa.sveidas.se, jmp.komreg.net, log-1.test.sveidas.se,
     log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net,
     p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.test.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.qa.komreg.net, validator-1.test.komreg.net, web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   sunetops: [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,
@@ -1811,8 +1789,7 @@ members:
     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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-1.test.komreg.net, validator-2.komreg.net,
-    web-1.qa.sveidas.se]
+    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se]
   test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se,
     test-1.test.sveidas.se]