diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index a001867b..3b39ba7c 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1,4 +1,22 @@
 classes:
+  eidas-connector-1.sveidas.se:
+    autoupdate: null
+    common: null
+    eid::dockerhost: null
+    eidas_connector: {hostname: connector.eidas.swedenconnect.se, version: 1.3.1}
+    entropyclient: null
+    infra_ca_rp: null
+    konsulter: null
+    mailclient: &id001 {domain: sunet.se}
+    nrpe: null
+    sunet::frontend::register_sites:
+      sites:
+        connector.eidas.swedenconnect.se:
+          frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
+          port: '443'
+    sunet::rsyslog: null
+    sunet_iaas_cloud: null
+    sunetops: null
   eidas-node-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -6,7 +24,7 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
-    mailclient: &id001 {domain: sunet.se}
+    mailclient: *id001
     nrpe: null
     openstack_dockerhost: null
     sunet::frontend::register_sites:
@@ -83,7 +101,7 @@ classes:
       vms:
         eidas-connector-1.sveidas.se: {bridge: br-eidas, cpus: '4', description: eid
             connector, gateway: 94.176.224.129, ip: 94.176.224.133, mac: '52:54:20:01:04:01',
-          memory: '4096', netmask: 255.255.255.240}
+          memory: '4096', netmask: 255.255.255.240, search: sveidas.se}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -297,66 +315,66 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
 members:
-  all: [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-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-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: [fe-fre-3.komreg.net]
+  all: [eidas-connector-1.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-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-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, fe-fre-3.komreg.net]
   eid::kvmhost: [kvmeidas-fre-3.komreg.net, kvmfe-fre-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvmmeta-fre-3.komreg.net]
-  eidas_connector: [eidas-node-1.qa.sveidas.se]
+  eidas_connector: [eidas-connector-1.sveidas.se, eidas-node-1.qa.sveidas.se]
   eidas_proxy: [eidas-proxy-1.qa.sveidas.se]
-  entropyclient: [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-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-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-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-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-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-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-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-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-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]
@@ -365,23 +383,23 @@ members:
   servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se]
   sunet::dehydrated: [r1.komreg.net]
   sunet::frontend::load_balancer: [fe-fre-3.komreg.net]
-  sunet::frontend::register_sites: [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-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-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,
+  sunet::frontend::register_sites: [eidas-connector-1.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-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-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-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-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]