diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 64bdab8b..eb60ce1e 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -316,88 +316,16 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-  eidas-redis-1.sveidas.se:
+  eidas-test-1.sveidas.se:
     autoupdate: null
     common: null
     eid::dockerhost: &id016 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    redis_cluster_node: null
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  eidas-redis-2.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: *id016
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    redis_cluster_node: null
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  eidas-redis-3.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: *id016
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    redis_cluster_node: null
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  eidas-redis-4.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: *id016
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    redis_cluster_node: null
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  eidas-redis-fe-1.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: &id017 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    redis_frontend_node: &id018 {hostname: redis.sveidas.se}
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  eidas-redis-fe-2.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: *id017
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    redis_frontend_node: *id018
-    sunet::rsyslog: null
-    sunet::server: *id002
-    sunetops: null
-  eidas-test-1.sveidas.se:
-    autoupdate: null
-    common: null
-    eid::dockerhost: &id019 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    entropyclient: null
-    infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: &id020
+    sunet::frontend::register_sites: &id017
       sites:
         test.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -405,21 +333,21 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: &id021 {environment: prod, hostname: test.swedenconnect.se, version: 2.0.1}
+    test_my_eid: &id018 {environment: prod, hostname: test.swedenconnect.se, version: 2.0.1}
   eidas-test-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id019
+    eid::dockerhost: *id016
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id020
+    sunet::frontend::register_sites: *id017
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: *id021
+    test_my_eid: *id018
   eidastest-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -575,7 +503,7 @@ classes:
     sunetops: null
   fe-fre-1.test.komreg.net:
     common: null
-    eid::dockerhost: &id022 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
+    eid::dockerhost: &id019 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     fe_servers: null
     infra_ca_rp: null
@@ -587,7 +515,7 @@ classes:
     sunetops: null
   fe-fre-3.komreg.net:
     common: null
-    eid::dockerhost: &id023 {version: '5:23.0.1-1~ubuntu.18.04~bionic'}
+    eid::dockerhost: &id020 {version: '5:23.0.1-1~ubuntu.18.04~bionic'}
     entropyclient: null
     fe_servers: null
     infra_ca_rp: null
@@ -599,7 +527,7 @@ classes:
     sunetops: null
   fe-tug-1.test.komreg.net:
     common: null
-    eid::dockerhost: *id022
+    eid::dockerhost: *id019
     entropyclient: null
     fe_servers: null
     infra_ca_rp: null
@@ -611,7 +539,7 @@ classes:
     sunetops: null
   fe-tug-3.komreg.net:
     common: null
-    eid::dockerhost: *id023
+    eid::dockerhost: *id020
     entropyclient: null
     fe_servers: null
     infra_ca_rp: null
@@ -647,7 +575,7 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
-    sunet::server: &id024 {ssh_allow_from_anywhere: true}
+    sunet::server: &id021 {ssh_allow_from_anywhere: true}
     sunetops: null
   jump-tug-3.komreg.net:
     autoupdate: null
@@ -660,7 +588,7 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
-    sunet::server: *id024
+    sunet::server: *id021
     sunetops: null
   kvmdemw-fre-3a.komreg.net:
     common: null
@@ -739,39 +667,6 @@ classes:
           memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
-        eidas-redis-1.sveidas.se:
-          bridge: br-eidas
-          cpus: '8'
-          description: eid fre redis cluster
-          gateway: 94.176.224.129
-          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
-          ip: 94.176.224.135
-          mac: '52:54:20:01:04:03'
-          memory: '8192'
-          netmask: 255.255.255.240
-          search: [sveidas.se]
-        eidas-redis-3.sveidas.se:
-          bridge: br-eidas
-          cpus: '8'
-          description: eid fre redis cluster
-          gateway: 94.176.224.129
-          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
-          ip: 94.176.224.138
-          mac: '52:54:20:01:04:06'
-          memory: '8192'
-          netmask: 255.255.255.240
-          search: [sveidas.se]
-        eidas-redis-fe-1.sveidas.se:
-          bridge: br-eidas
-          cpus: '8'
-          description: eid fre redis frontend
-          gateway: 94.176.224.129
-          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
-          ip: 94.176.224.137
-          mac: '52:54:20:01:04:05'
-          memory: '8192'
-          netmask: 255.255.255.240
-          search: [sveidas.se]
         eidas-test-1.sveidas.se:
           bridge: br-eidas
           cpus: '8'
@@ -849,39 +744,6 @@ classes:
           memory: '8192'
           netmask: 255.255.255.240
           search: [sveidas.se]
-        eidas-redis-2.sveidas.se:
-          bridge: br-eidas
-          cpus: '8'
-          description: eid tug redis cluster
-          gateway: 94.176.224.1
-          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
-          ip: 94.176.224.9
-          mac: '52:54:20:02:04:05'
-          memory: '8192'
-          netmask: 255.255.255.240
-          search: [sveidas.se]
-        eidas-redis-4.sveidas.se:
-          bridge: br-eidas
-          cpus: '8'
-          description: eid tug redis cluster
-          gateway: 94.176.224.1
-          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
-          ip: 94.176.224.10
-          mac: '52:54:20:02:04:06'
-          memory: '8192'
-          netmask: 255.255.255.240
-          search: [sveidas.se]
-        eidas-redis-fe-2.sveidas.se:
-          bridge: br-eidas
-          cpus: '8'
-          description: eid tug redis frontend
-          gateway: 94.176.224.1
-          image_url: https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
-          ip: 94.176.224.7
-          mac: '52:54:20:02:04:03'
-          memory: '8192'
-          netmask: 255.255.255.240
-          search: [sveidas.se]
         eidas-test-2.sveidas.se:
           bridge: br-eidas
           cpus: '8'
@@ -1363,13 +1225,13 @@ classes:
   prid-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id025 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id022 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: &id026 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid: &id023 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4_ubuntu}
     servicemonitor: null
     sunet::rsyslog: null
@@ -1378,13 +1240,13 @@ classes:
   prid-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id025
+    eid::dockerhost: *id022
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: *id026
+    prid: *id023
     servicemonitor: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1481,13 +1343,13 @@ classes:
   validator-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: &id027 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
+    eid::dockerhost: &id024 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: &id028
+    sunet::frontend::register_sites: &id025
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1495,7 +1357,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id029 {version: 3.2.0}
+    validator: &id026 {version: 3.2.0}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1518,17 +1380,17 @@ classes:
   validator-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: *id027
+    eid::dockerhost: *id024
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id028
+    sunet::frontend::register_sites: *id025
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id029
+    validator: *id026
   validator-test-1.komreg.net:
     autoupdate: null
     common: null
@@ -1573,14 +1435,12 @@ members:
     eidas-connector-2.test.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-1.test.sveidas.se, eidas-proxy-2.sveidas.se, eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net,
-    eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net,
-    eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net,
-    fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net,
-    jump-tug-3.komreg.net, kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
+    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, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
+    eumd-test-2.komreg.net, eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
+    eupub-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
+    fe-tug-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net,
+    kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, 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,
     log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
@@ -1597,8 +1457,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, jmp.komreg.net,
@@ -1616,8 +1474,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1638,13 +1494,11 @@ members:
     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-1.test.sveidas.se,
     eidas-proxy-2.sveidas.se, eidas-proxy-2.test.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,
-    eidastest-1.qa.sveidas.se, eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
-    eumd-test-2.komreg.net, fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net,
-    fe-tug-3.komreg.net, log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se,
-    log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
+    eidas-proxy-4.sveidas.se, eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se,
+    eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net,
+    fe-fre-1.test.komreg.net, fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net,
+    log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se,
+    md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
     natmd-test-1.komreg.net, natmd-test-2.komreg.net, nic.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-1.qa.komreg.net,
@@ -1675,8 +1529,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1701,8 +1553,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1738,8 +1588,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1777,8 +1625,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1801,9 +1647,6 @@ members:
   proxy_eidas_metadata: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
     eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se,
     eidas-proxy-4.sveidas.se]
-  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, demw-1.sveidas.se, demw-2.sveidas.se]
   servicemonitor: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se]
   site_alias: [web-1.qa.sveidas.se]
@@ -1830,8 +1673,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1854,8 +1695,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,
@@ -1885,8 +1724,6 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se, eidas-proxy-2.sveidas.se,
     eidas-proxy-2.test.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, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net, eupub-1.komreg.net,
     eupub-2.komreg.net, eupub-test-1.komreg.net, eupub-test-2.komreg.net, fe-fre-1.test.komreg.net,