diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 75677dbf..4064bb59 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -20,12 +20,24 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
   demw-1.sveidas.se:
+    autoupdate: null
     common: null
+    eid::dockerhost: null
+    eidas_de_middleware: {hostname: demw.eidas.swedenconnect.se, version: eidas-qa}
     entropyclient: null
     infra_ca_rp: null
+    konsulter: null
     mailclient: *id001
     nrpe: null
+    saml_metadata: {filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml,
+      url: 'https://connector.eidas.swedenconnect.se/idp/metadata/sp'}
+    sunet::frontend::register_sites:
+      sites:
+        demw.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-connector-1.sveidas.se:
     autoupdate: null
@@ -1005,7 +1017,7 @@ classes:
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
-    validator: {version: 2.1.3}
+    validator: {version: 3.0.0}
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -1042,20 +1054,20 @@ 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]
-  autoupdate: [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-proxy-1.sveidas.se, eidas-proxy-2.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, 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-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: [demw-1.qa.sveidas.se, demw-1.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-2.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, 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-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, demw-1.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,
@@ -1072,21 +1084,21 @@ members:
     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: [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-proxy-1.sveidas.se,
-    eidas-proxy-2.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, eumd-1.komreg.net, eumd-2.komreg.net,
-    fe-fre-3.komreg.net, fe-tug-3.komreg.net, monitor-tug-3.komreg.net, natmd-1.komreg.net,
-    natmd-2.komreg.net, prid-1.sveidas.se, prid-2.sveidas.se, refidp-1.qa.sveidas.se,
-    test-1.qa.sveidas.se]
+  eid::dockerhost: [demw-1.qa.sveidas.se, demw-1.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.sveidas.se, eidas-proxy-2.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,
+    eumd-1.komreg.net, eumd-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net,
+    monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, prid-1.sveidas.se,
+    prid-2.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se]
   eid::kvmhost: [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]
   eidas_connector: [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_de_middleware: [demw-1.qa.sveidas.se]
+  eidas_de_middleware: [demw-1.qa.sveidas.se, demw-1.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-2.sveidas.se, log.qa.sveidas.se]
   eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net]
@@ -1127,14 +1139,15 @@ members:
     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: [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-proxy-1.sveidas.se, eidas-proxy-2.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,
-    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-2.sveidas.se,
-    refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.qa.komreg.net]
+  konsulter: [demw-1.qa.sveidas.se, demw-1.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-2.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, 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-2.sveidas.se, refidp-1.qa.sveidas.se,
+    test-1.qa.sveidas.se, validator-1.qa.komreg.net]
   mailclient: [demw-1.qa.sveidas.se, demw-1.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,
@@ -1186,14 +1199,14 @@ members:
   redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
     eidas-redis-4.sveidas.se]
   redis_frontend_node: [eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se]
-  saml_metadata: [demw-1.qa.sveidas.se]
+  saml_metadata: [demw-1.qa.sveidas.se, demw-1.sveidas.se]
   servicemonitor: [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, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se,
     prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, test-1.qa.sveidas.se]
   site_alias: [web-1.qa.sveidas.se]
   sunet::auditd: [jmp.komreg.net]
   sunet::frontend::load_balancer: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
-  sunet::frontend::register_sites: [demw-1.qa.sveidas.se, eidas-connector-1.sveidas.se,
+  sunet::frontend::register_sites: [demw-1.qa.sveidas.se, demw-1.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-2.sveidas.se, eidas-proxy-3.sveidas.se, eidas-proxy-4.sveidas.se,
@@ -1217,11 +1230,11 @@ 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]
-  sunet_iaas_cloud: [demw-1.qa.sveidas.se, 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]
+  sunet_iaas_cloud: [demw-1.qa.sveidas.se, demw-1.sveidas.se, 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, demw-1.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,