diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 29a6509c..d198b159 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1297,6 +1297,15 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
     swedenconnect_refidp: {env: test, hostname: test.test.swedenconnect.se, version: 1.3.1}
+  relay-1.swedenconnect.se:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    nrpe: null
+    sunet::rsyslog: null
+    sunet::server: *id002
+    sunetops: null
   test-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -1405,8 +1414,8 @@ members:
     natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net, natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   autoupdate: [country-test-1.test.komreg.net, 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,
@@ -1443,8 +1452,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   eid::dockerhost: [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, eidas-node-1.qa.sveidas.se,
@@ -1498,8 +1507,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.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]
   infra_ca_rp: [country-test-1.test.komreg.net, demw-1.qa.sveidas.se, demw-1.sveidas.se,
@@ -1521,8 +1530,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   jumphosts: [jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net]
   konsulter: [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,
@@ -1556,8 +1565,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
     eupub-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-2.komreg.net, p1.komreg.net, p2.qa.komreg.net]
@@ -1593,8 +1602,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se]
   prid_local: [eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se]
   proxy_eidas_metadata: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
@@ -1638,8 +1647,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   sunet::server: [country-test-1.test.komreg.net, 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,
@@ -1660,8 +1669,8 @@ members:
     natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net, natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   sunet_iaas_cloud: [demw-1.qa.sveidas.se, eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se,
     eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.test.sveidas.se,
     eidas-proxy-2.test.sveidas.se, eidastest-1.qa.sveidas.se, jmp.komreg.net, log-1.test.sveidas.se,
@@ -1687,8 +1696,8 @@ members:
     natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-1.komreg.net,
     natpub-test-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, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se, refidp-1.test.sveidas.se]
   test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se,
     test-1.test.sveidas.se]