diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index f6237a5c..c088a9d1 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -82,13 +82,17 @@ classes:
     sunet::server: *id002
     sunetops: null
   eidas-connector-1.test.sveidas.se:
+    autoupdate: null
     common: null
+    eid::dockerhost: &id005 {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
   eidas-connector-2.sveidas.se:
     autoupdate: null
@@ -105,13 +109,17 @@ classes:
     sunet::server: *id002
     sunetops: null
   eidas-connector-2.test.sveidas.se:
+    autoupdate: null
     common: null
+    eid::dockerhost: *id005
     entropyclient: null
     infra_ca_rp: null
+    konsulter: null
     mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunet::server: *id002
+    sunet_iaas_cloud: null
     sunetops: null
   eidas-connector-3.sveidas.se:
     autoupdate: null
@@ -185,7 +193,7 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_proxy: &id005 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION,
+    eidas_proxy: &id006 {hostname: proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION,
       version: 1.3.5}
     entropyclient: null
     infra_ca_rp: null
@@ -193,7 +201,7 @@ classes:
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: &id006
+    sunet::frontend::register_sites: &id007
       sites:
         proxy.eidas.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -204,7 +212,7 @@ classes:
   eidas-proxy-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id007 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id008 {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -218,21 +226,21 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_proxy: *id005
+    eidas_proxy: *id006
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id006
+    sunet::frontend::register_sites: *id007
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
   eidas-proxy-2.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id007
+    eid::dockerhost: *id008
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -246,14 +254,14 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_proxy: *id005
+    eidas_proxy: *id006
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id006
+    sunet::frontend::register_sites: *id007
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -261,14 +269,14 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_proxy: *id005
+    eidas_proxy: *id006
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id006
+    sunet::frontend::register_sites: *id007
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -328,7 +336,7 @@ classes:
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
-    redis_frontend_node: &id008 {hostname: redis.sveidas.se}
+    redis_frontend_node: &id009 {hostname: redis.sveidas.se}
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -340,7 +348,7 @@ classes:
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
-    redis_frontend_node: *id008
+    redis_frontend_node: *id009
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -354,7 +362,7 @@ classes:
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: &id009
+    sunet::frontend::register_sites: &id010
       sites:
         test.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -362,7 +370,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: &id010 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1}
+    test_my_eid: &id011 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1}
   eidas-test-2.sveidas.se:
     autoupdate: null
     common: null
@@ -373,11 +381,11 @@ classes:
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id009
+    sunet::frontend::register_sites: *id010
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: *id010
+    test_my_eid: *id011
   eidastest-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -897,7 +905,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: &id011 {udp_client: 94.176.224.0/24, udp_port: 514}
+    sunet::rsyslog: &id012 {udp_client: 94.176.224.0/24, udp_port: 514}
     sunet::server: *id002
     sunetops: null
   log-2.sveidas.se:
@@ -911,7 +919,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: *id011
+    sunet::rsyslog: *id012
     sunet::server: *id002
     sunetops: null
   log.qa.sveidas.se:
@@ -1125,7 +1133,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: &id012 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid: &id013 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4}
     servicemonitor: null
     sunet::rsyslog: null
@@ -1134,7 +1142,7 @@ classes:
   prid-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id013 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id014 {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1153,7 +1161,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: *id012
+    prid: *id013
     servicemonitor: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1161,7 +1169,7 @@ classes:
   prid-2.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id013
+    eid::dockerhost: *id014
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1246,7 +1254,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: &id014
+    sunet::frontend::register_sites: &id015
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1254,7 +1262,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id015 {version: 3.0.10}
+    validator: &id016 {version: 3.0.10}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1292,11 +1300,11 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id014
+    sunet::frontend::register_sites: *id015
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id015
+    validator: *id016
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -1340,21 +1348,22 @@ members:
     validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.sveidas.se,
     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-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se,
-    eidas-proxy-3.sveidas.se, 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, jmp.komreg.net, jump-fre-3.komreg.net,
-    jump-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
-    md-eu1.qa.komreg.net, 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,
-    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-2.komreg.net, web-1.qa.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-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
+    eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se,
+    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, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+    log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, 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, 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-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,
@@ -1377,15 +1386,16 @@ members:
     validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.sveidas.se,
     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-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
-    eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se,
-    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, fe-fre-3.komreg.net,
-    fe-tug-3.komreg.net, log-1.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, monitor-tug-3.komreg.net,
-    natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.sveidas.se, prid-1.test.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-proxy-1.qa.sveidas.se,
+    eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
+    eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se, 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, fe-fre-3.komreg.net, fe-tug-3.komreg.net, log-1.sveidas.se,
+    log-2.sveidas.se, log.qa.sveidas.se, monitor-tug-3.komreg.net, natmd-1.komreg.net,
+    natmd-2.komreg.net, nic.komreg.net, 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.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,
@@ -1447,11 +1457,12 @@ members:
     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-2.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se,
-    eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se,
-    eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
-    eumd-1.komreg.net, eumd-2.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+    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-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
+    eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se,
+    eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eumd-1.komreg.net,
+    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, md-eu1.qa.komreg.net,
     md1.komreg.net, natmd-1.komreg.net, natmd-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,
@@ -1578,12 +1589,13 @@ members:
     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.sveidas.se,
     validator-2.komreg.net, web-1.qa.sveidas.se]
-  sunet_iaas_cloud: [demw-1.qa.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.qa.sveidas.se, md-eu1.qa.komreg.net, 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]
+  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.qa.sveidas.se,
+    md-eu1.qa.komreg.net, 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]
   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,