diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 272d2eb1..1d8e2e7c 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -31,6 +31,20 @@ classes:
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
+  eidas-connector-3.sveidas.se:
+    autoupdate: null
+    common: null
+    eid::dockerhost: null
+    eidas_connector: *id001
+    entropyclient: null
+    infra_ca_rp: null
+    konsulter: null
+    mailclient: *id002
+    nrpe: null
+    sunet::frontend::register_sites: *id003
+    sunet::rsyslog: null
+    sunet_iaas_cloud: null
+    sunetops: null
   eidas-node-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -358,66 +372,76 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
 members:
-  all: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
-  autoupdate: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md-fre-3.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
-    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
-  common: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
-  eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, fe-fre-3.komreg.net]
+  all: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
+  autoupdate: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
+  common: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
+  eid::dockerhost: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    fe-fre-3.komreg.net]
   eid::kvmhost: [kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net,
     kvminfra-fre-3.komreg.net, kvmmeta-fre-3.komreg.net]
-  eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se]
+  eidas_connector: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se]
   eidas_proxy: [eidas-proxy-1.qa.sveidas.se]
-  entropyclient: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+  entropyclient: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.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-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
-  konsulter: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md-fre-3.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se]
-  mailclient: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+  infra_ca_rp: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
+  konsulter: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net,
+    jump-tug-3.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net, nic.komreg.net,
+    prid-1.qa.sveidas.se]
+  mailclient: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
   md_publisher: [p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [md-eu1.qa.komreg.net, md-fre-3.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [md-eu1.qa.komreg.net, md1.komreg.net]
   nagios_monitor: [monitor-fre-3.komreg.net, nic.komreg.net]
-  nrpe: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+  nrpe: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.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-fre-3.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
     web-1.qa.sveidas.se]
@@ -427,24 +451,26 @@ members:
   sunet::dehydrated: [r1.komreg.net]
   sunet::frontend::load_balancer: [fe-fre-3.komreg.net]
   sunet::frontend::register_sites: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se,
-    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, p1.komreg.net, p2.qa.komreg.net,
-    web-1.qa.sveidas.se]
-  sunet::rsyslog: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
-  sunet_iaas_cloud: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
+    eidas-connector-3.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
+    p1.komreg.net, p2.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-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
+  sunet_iaas_cloud: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, md-eu1.qa.komreg.net,
+    md-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    r1.komreg.net, web-1.qa.sveidas.se]
+  sunetops: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-3.sveidas.se,
+    eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-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,
+    md-eu1.qa.komreg.net, md-fre-3.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
     web-1.qa.sveidas.se]
-  sunetops: [eidas-connector-1.sveidas.se, eidas-connector-2.sveidas.se, eidas-node-1.qa.sveidas.se,
-    eidas-proxy-1.qa.sveidas.se, fe-fre-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, md-eu1.qa.komreg.net, md-fre-3.komreg.net,
-    md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]