diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 56e6ab3d..2435ec00 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -24,7 +24,8 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_de_middleware_hsm: {hostname: demw.eidas.swedenconnect.se, version: 110-fixes-sc-p11}
+    eidas_de_middleware_hsm: {enabled: true, hostname: demw.eidas.swedenconnect.se,
+      version: 110-fixes-sc-p11}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -44,7 +45,8 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: null
-    eidas_de_middleware_hsm: {hostname: demw.eidas.swedenconnect.se, version: 110-fixes-sc-p11}
+    eidas_de_middleware_hsm: {enabled: false, hostname: demw.eidas.swedenconnect.se,
+      version: 110-fixes-sc-p11}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -52,6 +54,11 @@ classes:
     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: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
+          port: '443'
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1344,13 +1351,14 @@ members:
   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, 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, eidastest-1.qa.sveidas.se, 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::frontend::register_sites: [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-2.sveidas.se, eidas-proxy-3.sveidas.se,
+    eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se,
+    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::nagiosapi: [nic.komreg.net]
   sunet::rsyslog: [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,