diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index c46f7c3e..053097b9 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1,13 +1,21 @@
 classes:
+  demw-1.qa.sveidas.se:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: &id001 {domain: sunet.se}
+    nrpe: null
+    sunet::rsyslog: null
+    sunetops: null
   eidas-connector-1.sveidas.se:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_connector: &id001 {hostname: connector.eidas.swedenconnect.se, version: 1.3.5}
+    eidas_connector: &id002 {hostname: connector.eidas.swedenconnect.se, version: 1.3.5}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: &id002 {domain: sunet.se}
+    mailclient: *id001
     nrpe: null
     sunet::frontend::register_sites: &id003
       sites:
@@ -20,11 +28,11 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_connector: *id001
+    eidas_connector: *id002
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::frontend::register_sites: *id003
     sunet::rsyslog: null
@@ -33,11 +41,11 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_connector: *id001
+    eidas_connector: *id002
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::frontend::register_sites: *id003
     sunet::rsyslog: null
@@ -46,11 +54,11 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_connector: *id001
+    eidas_connector: *id002
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::frontend::register_sites: *id003
     sunet::rsyslog: null
@@ -62,7 +70,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     openstack_dockerhost: null
     sunet::frontend::register_sites:
@@ -80,7 +88,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     openstack_dockerhost: null
     servicemonitor: null
@@ -98,7 +106,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     redis_cluster_node: null
     sunet::rsyslog: null
@@ -109,7 +117,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     redis_cluster_node: null
     sunet::rsyslog: null
@@ -120,7 +128,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     redis_cluster_node: null
     sunet::rsyslog: null
@@ -131,7 +139,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     redis_cluster_node: null
     sunet::rsyslog: null
@@ -142,7 +150,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     redis_frontend_node: &id004 {hostname: redis.sveidas.se}
     sunet::rsyslog: null
@@ -153,7 +161,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     redis_frontend_node: *id004
     sunet::rsyslog: null
@@ -166,7 +174,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     servicemonitor: null
     sunet::frontend::register_sites: &id006
@@ -184,7 +192,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     servicemonitor: null
     sunet::frontend::register_sites: *id006
@@ -198,7 +206,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     md_repo_client: null
     md_signer: {dest_host: eupub-1.komreg.net, name: eidas-prod}
     metadatamgrs: null
@@ -213,7 +221,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     md_repo_client: null
     md_signer: {dest_host: eupub-2.komreg.net, name: eidas-prod}
     metadatamgrs: null
@@ -225,7 +233,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_publisher: {keyname: eupub-1.komreg.net_infra}
     nrpe: null
     sunet::frontend::register_sites:
@@ -240,7 +248,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_publisher: {keyname: eupub-2.komreg.net_infra}
     nrpe: null
     sunet::frontend::register_sites:
@@ -255,7 +263,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::frontend::load_balancer: null
     sunet::rsyslog: null
@@ -265,7 +273,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::frontend::load_balancer: null
     sunet::rsyslog: null
@@ -277,7 +285,7 @@ classes:
     infra_ca_rp: null
     jumphosts: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     metadatamgrs: null
     nrpe: null
     sunet::auditd: null
@@ -291,7 +299,7 @@ classes:
     infra_ca_rp: null
     jumphosts: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
@@ -303,7 +311,7 @@ classes:
     infra_ca_rp: null
     jumphosts: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
@@ -384,7 +392,7 @@ classes:
           search: [sveidas.se]
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -464,7 +472,7 @@ classes:
           search: [sveidas.se]
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -477,7 +485,7 @@ classes:
           netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -490,7 +498,7 @@ classes:
           netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -513,7 +521,7 @@ classes:
           memory: '4096', netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -536,7 +544,7 @@ classes:
           memory: '4096', netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -558,7 +566,7 @@ classes:
           memory: '4096', netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -580,7 +588,7 @@ classes:
           memory: '4096', netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
@@ -589,7 +597,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: &id007 {udp_client: 94.176.224.0/24, udp_port: 514}
     sunetops: null
@@ -598,7 +606,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: *id007
     sunetops: null
@@ -607,7 +615,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::rsyslog: {udp_port: 514}
     sunet_iaas_cloud: null
@@ -619,7 +627,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     md_repo_client: null
     md_signer: {dest_host: p2.qa.komreg.net, name: eidas-qa}
     metadatamgrs: null
@@ -635,7 +643,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     md_signer: {dest_host: p1.komreg.net, name: natmd-qa}
     metadatamgrs: null
     nrpe: null
@@ -648,7 +656,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nagios_monitor: null
     nrpe: null
     sunet::rsyslog: null
@@ -659,7 +667,7 @@ classes:
     eid::dockerhost: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nagios_monitor: null
     nrpe: null
     sunet::rsyslog: null
@@ -672,7 +680,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     md_repo_client: null
     md_signer: {dest_host: natpub-1.komreg.net, name: natmd-prod}
     metadatamgrs: null
@@ -687,7 +695,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     md_repo_client: null
     md_signer: {dest_host: natpub-2.komreg.net, name: natmd-prod}
     metadatamgrs: null
@@ -699,7 +707,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_publisher: {keyname: natpub-1.komreg.net_infra}
     nrpe: null
     sunet::frontend::register_sites:
@@ -714,7 +722,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_publisher: {keyname: natpub-2.komreg.net_infra}
     nrpe: null
     sunet::frontend::register_sites:
@@ -730,7 +738,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nagios_monitor: null
     nrpe: null
     sunet::rsyslog: null
@@ -741,7 +749,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_publisher: {keyname: p1.komreg.net_infra}
     nrpe: null
     sunet::frontend::register_sites:
@@ -757,7 +765,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_publisher: {keyname: p2.qa.komreg.net_infra}
     nrpe: null
     sunet::frontend::register_sites:
@@ -774,7 +782,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     openstack_dockerhost: null
     prid: {clients: prid_qa_clients, version: 1.0.1}
@@ -789,7 +797,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     prid: &id008 {clients: prid_prod_clients, version: 1.0.1}
     servicemonitor: null
@@ -802,7 +810,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     prid: *id008
     servicemonitor: null
@@ -813,7 +821,7 @@ classes:
     common: null
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     md_repo_server: {hostname: r1.komreg.net}
     nrpe: null
     openstack_dockerhost: null
@@ -828,7 +836,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     sunet::frontend::register_sites:
       sites:
@@ -847,7 +855,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     servicemonitor: null
     sunet::frontend::register_sites:
@@ -864,7 +872,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     openstack_dockerhost: null
     sunet::frontend::register_sites:
@@ -882,7 +890,7 @@ classes:
     entropyclient: null
     github_client_credential: null
     infra_ca_rp: null
-    mailclient: *id002
+    mailclient: *id001
     nrpe: null
     openstack_dockerhost: null
     pages: null
@@ -895,20 +903,21 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
 members:
-  all: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  all: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
+    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   autoupdate: [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-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
@@ -921,20 +930,21 @@ members:
     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,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  common: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  common: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
+    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
     eidas-connector-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,
@@ -951,35 +961,37 @@ members:
   eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net]
   eidas_proxy: [eidas-proxy-1.qa.sveidas.se]
   eidas_sp: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se]
-  entropyclient: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  entropyclient: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
+    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   github_client_credential: [web-1.qa.sveidas.se]
-  infra_ca_rp: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  infra_ca_rp: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
+    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net]
   konsulter: [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,
@@ -988,20 +1000,21 @@ members:
     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-2.sveidas.se, refidp-1.qa.sveidas.se,
     test-1.qa.sveidas.se, validator-1.qa.komreg.net]
-  mailclient: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  mailclient: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
+    validator-1.qa.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,
     p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, md-eu1.qa.komreg.net, natmd-1.komreg.net,
@@ -1013,20 +1026,21 @@ members:
     jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     natmd-1.komreg.net, natmd-2.komreg.net]
   nagios_monitor: [monitor-fre-3.komreg.net, monitor-tug-3.komreg.net, nic.komreg.net]
-  nrpe: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  nrpe: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
+    validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     md-eu1.qa.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, prid-1.qa.sveidas.se,
     r1.komreg.net, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
@@ -1046,39 +1060,41 @@ members:
     eupub-1.komreg.net, 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,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  sunet::rsyslog: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-2.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
+  sunet::rsyslog: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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-2.sveidas.se,
+    r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net,
+    web-1.qa.sveidas.se]
+  sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-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, r1.komreg.net,
+    refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
+  sunetops: [demw-1.qa.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-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,
+    eumd-1.komreg.net, eumd-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
+    fe-fre-3.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.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-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, 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,
     validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-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, r1.komreg.net,
-    refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
-  sunetops: [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-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, eumd-1.komreg.net, eumd-2.komreg.net,
-    eupub-1.komreg.net, eupub-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
-    jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.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-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,
-    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, validator-1.qa.komreg.net, web-1.qa.sveidas.se]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se]
   validator: [validator-1.qa.komreg.net]