diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index d2e11939..74167655 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1217,40 +1217,6 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-  natpub-test-1-komreg.net:
-    autoupdate: null
-    common: null
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    md_publisher: {keyname: natpub.test.komreg.net_infra}
-    mdsl_publisher: null
-    nrpe: null
-    sunet::frontend::register_sites:
-      sites:
-        test.md.eidas.swedenconnect.se:
-          frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
-          port: '443'
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  natpub-test-2-komreg.net:
-    autoupdate: null
-    common: null
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    md_publisher: {keyname: natpub.test.komreg.net_infra}
-    mdsl_publisher: null
-    nrpe: null
-    sunet::frontend::register_sites:
-      sites:
-        test.md.eidas.swedenconnect.se:
-          frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
-          port: '443'
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
   nic.komreg.net:
     autoupdate: null
     common: null
@@ -1520,11 +1486,10 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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,
@@ -1539,10 +1504,9 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.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-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,
@@ -1562,11 +1526,10 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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,
@@ -1617,11 +1580,10 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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]
@@ -1643,11 +1605,10 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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,
@@ -1679,21 +1640,20 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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, eupub-test-1.komreg.net,
-    eupub-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-2-komreg.net, p1.komreg.net, p2.qa.komreg.net]
+    eupub-test-2.komreg.net, natpub-1.komreg.net, natpub-2.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,
     natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [eumd-1.komreg.net, eumd-2.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]
   mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
-    eupub-test-2.komreg.net, natpub-test-1-komreg.net, natpub-test-2-komreg.net, p2.qa.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]
@@ -1716,11 +1676,10 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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]
@@ -1743,10 +1702,9 @@ members:
     eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
     eidas-proxy-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
     eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se, eupub-1.komreg.net,
-    eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-2-komreg.net, p1.komreg.net, p2.qa.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]
+    eupub-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, p1.komreg.net, p2.qa.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]
   sunet::fticks: [log.qa.sveidas.se]
   sunet::nagiosapi: [nic.komreg.net]
   sunet::rsyslog: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
@@ -1768,10 +1726,9 @@ members:
     log-2.sveidas.se, log-2.sveidas.se, log.qa.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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.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-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,
@@ -1791,10 +1748,10 @@ members:
     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,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1-komreg.net,
-    natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.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-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,
@@ -1820,11 +1777,10 @@ members:
     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, natpub-test-1-komreg.net, natpub-test-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-test.komreg.net, validator-1.komreg.net, validator-1.qa.komreg.net,
-    validator-2.komreg.net, web-1.qa.sveidas.se]
+    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-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]