diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index a8f9c536..06d570b5 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1420,7 +1420,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-tug-1.test.komreg.net, fe-fre-1.test.komreg.net]
           port: '443'
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1529,8 +1529,8 @@ classes:
     nrpe: null
     sunet::frontend::register_sites:
       sites:
-        validator.test.swedenconnect.se:
-          frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
+        test.validator.swedenconnect.se:
+          frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
           port: '443'
     sunet::rsyslog: null
     sunet::server: *id002
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index b1b71451..4daf581e 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -884,8 +884,8 @@ demw-2.sveidas.se:
      sites:
        'test.test.swedenconnect.se':
          frontends:
-           - 'se-fre-lb-1.sunet.se'
-           - 'se-tug-lb-1.sunet.se'
+           - 'fe-tug-1.test.komreg.net'
+           - 'fe-fre-1.test.komreg.net'
          port: '443'
 
 '^eidas-test-[0-9]+\.sveidas\.se$':
@@ -957,10 +957,10 @@ validator-test-1.komreg.net:
       version: 3.0.10
    sunet::frontend::register_sites:
      sites:
-       'validator.test.swedenconnect.se':
+       'test.validator.swedenconnect.se':
          frontends:
-            - 'fe-fre-3.komreg.net'
-            - 'fe-tug-3.komreg.net'
+            - 'fe-fre-1.test.komreg.net'
+            - 'fe-tug-1.test.komreg.net'
          port: '443'
 
 '^eidas-proxy-[0-9]+\.sveidas\.se$':