diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 5bb5ee23..eabe27db 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -926,15 +926,13 @@ classes:
   log-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id020 {version: '5:20.10.8~3-0~ubuntu-bionic'}
-    eid::telegraf: null
-    eidas_log: null
+    eid::dockerhost: {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: &id021 {udp_client: 94.176.224.0/24, udp_port: 514}
+    sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
   log-1.test.sveidas.se:
@@ -954,7 +952,7 @@ classes:
   log-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id020
+    eid::dockerhost: {version: '5:20.10.8~3-0~ubuntu-bionic'}
     eid::telegraf: null
     eidas_log: null
     entropyclient: null
@@ -962,7 +960,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: *id021
+    sunet::rsyslog: {udp_client: 94.176.224.0/24, udp_port: 514}
     sunet::server: *id002
     sunetops: null
   log.qa.sveidas.se:
@@ -1171,13 +1169,13 @@ classes:
   prid-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id022 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id020 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: &id023 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid: &id021 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4}
     servicemonitor: null
     sunet::rsyslog: null
@@ -1186,7 +1184,7 @@ classes:
   prid-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id024 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id022 {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1199,13 +1197,13 @@ classes:
   prid-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id022
+    eid::dockerhost: *id020
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: *id023
+    prid: *id021
     servicemonitor: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1213,7 +1211,7 @@ classes:
   prid-2.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id024
+    eid::dockerhost: *id022
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1298,13 +1296,13 @@ classes:
   validator-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: &id025 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id023 {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: &id026
+    sunet::frontend::register_sites: &id024
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1312,7 +1310,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id027 {version: 3.0.10}
+    validator: &id025 {version: 3.0.10}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1348,17 +1346,17 @@ classes:
   validator-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: *id025
+    eid::dockerhost: *id023
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id026
+    sunet::frontend::register_sites: *id024
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id027
+    validator: *id025
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -1459,14 +1457,14 @@ members:
   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]
-  eid::telegraf: [log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se]
+  eid::telegraf: [log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se]
   eidas_connector: [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]
   eidas_de_middleware: [demw-1.qa.sveidas.se]
   eidas_de_middleware_hsm: [demw-1.sveidas.se, demw-2.sveidas.se]
   eidas_hsm_client: [eumd-1.komreg.net, eumd-2.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net]
-  eidas_log: [log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se]
+  eidas_log: [log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se]
   eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net]
   eidas_proxy: [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]
@@ -1619,9 +1617,9 @@ members:
     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, 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,
+    kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-1.test.sveidas.se,
+    log-1.test.sveidas.se, 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, 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,