diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 07295464..52374014 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1282,19 +1282,6 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-  prid-1.test.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: &id025 {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
   prid-2.sveidas.se:
     autoupdate: null
     common: null
@@ -1309,19 +1296,6 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-  prid-2.test.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: *id025
-    entropyclient: null
-    infra_ca_rp: null
-    konsulter: null
-    mailclient: *id001
-    nrpe: null
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunet_iaas_cloud: null
-    sunetops: null
   r1.komreg.net:
     autoupdate: null
     common: null
@@ -1409,13 +1383,13 @@ classes:
   validator-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: &id026 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id025 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: &id027
+    sunet::frontend::register_sites: &id026
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1423,7 +1397,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id028 {version: 3.0.10}
+    validator: &id027 {version: 3.0.10}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1446,17 +1420,17 @@ classes:
   validator-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: *id026
+    eid::dockerhost: *id025
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id027
+    sunet::frontend::register_sites: *id026
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id028
+    validator: *id027
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -1496,10 +1470,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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,
@@ -1515,9 +1489,9 @@ members:
     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, natpub-test-1-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-test.komreg.net,
-    validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.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-test.komreg.net, 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,
@@ -1536,10 +1510,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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,
@@ -1553,9 +1527,8 @@ members:
     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-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,
+    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-test.komreg.net, 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,
@@ -1591,10 +1564,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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]
@@ -1616,10 +1589,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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,
@@ -1630,10 +1603,9 @@ members:
     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-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-2.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-test.komreg.net, 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,
@@ -1652,10 +1624,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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,
@@ -1687,10 +1659,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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]
@@ -1738,10 +1710,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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,
@@ -1761,17 +1733,16 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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, web-1.qa.sveidas.se]
+    p2.qa.komreg.net, prid-1.qa.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, 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,
@@ -1790,10 +1761,10 @@ members:
     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, natpub-test-1-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-test.komreg.net, validator-1.komreg.net,
-    validator-1.qa.komreg.net, validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-test.komreg.net, validator-1.komreg.net, 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]