diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 82d15b4f..de7f1c66 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -94,7 +94,7 @@ classes:
     sunet::frontend::register_sites: &id008
       sites:
         test.connector.eidas.swedenconnect.se:
-          frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
+          frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
           port: '443'
     sunet::rsyslog: null
     sunet::server: *id002
@@ -485,9 +485,11 @@ classes:
     common: null
     eid::dockerhost: &id019 {version: '5:20.10.12~3-0~ubuntu-focal'}
     entropyclient: null
+    fe_servers: null
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
+    sunet::frontend::load_balancer: null
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -507,9 +509,11 @@ classes:
     common: null
     eid::dockerhost: *id019
     entropyclient: null
+    fe_servers: null
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
+    sunet::frontend::load_balancer: null
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1331,7 +1335,7 @@ classes:
     sunet::frontend::register_sites:
       sites:
         test.test.swedenconnect.se:
-          frontends: [se-fre-lb-1.sunet.se, se-tug-lb-1.sunet.se]
+          frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
           port: '443'
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1538,7 +1542,8 @@ members:
     r1.komreg.net, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se,
     validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
-  fe_servers: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
+  fe_servers: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
+    fe-tug-3.komreg.net]
   github_client_credential: [web-1.qa.sveidas.se]
   infra_ca_rp: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se, eidas-connector-1.sveidas.se,
     eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se,
@@ -1644,7 +1649,8 @@ members:
     test-1.test.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::load_balancer: [fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
+    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net]
   sunet::frontend::register_sites: [demw-1.qa.sveidas.se, demw-1.sveidas.se, demw-2.sveidas.se,
     eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.sveidas.se,
     eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se, eidas-connector-4.sveidas.se,