diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 9f7fa94e..729bc23a 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -291,7 +291,7 @@ classes:
   eidas-redis-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: &id012 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -303,7 +303,7 @@ classes:
   eidas-redis-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: *id012
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -315,7 +315,7 @@ classes:
   eidas-redis-3.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: *id012
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -327,7 +327,7 @@ classes:
   eidas-redis-4.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: *id012
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -344,7 +344,7 @@ classes:
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
-    redis_frontend_node: &id012 {hostname: redis.sveidas.se}
+    redis_frontend_node: &id013 {hostname: redis.sveidas.se}
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -356,21 +356,21 @@ classes:
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
-    redis_frontend_node: *id012
+    redis_frontend_node: *id013
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
   eidas-test-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id013 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id014 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: &id014
+    sunet::frontend::register_sites: &id015
       sites:
         test.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -378,22 +378,22 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: &id015 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1}
+    test_my_eid: &id016 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1}
   eidas-test-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id013
+    eid::dockerhost: *id014
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id014
+    sunet::frontend::register_sites: *id015
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: *id015
+    test_my_eid: *id016
   eidastest-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -529,7 +529,7 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
-    sunet::server: &id016 {ssh_allow_from_anywhere: true}
+    sunet::server: &id017 {ssh_allow_from_anywhere: true}
     sunetops: null
   jump-tug-3.komreg.net:
     autoupdate: null
@@ -542,7 +542,7 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
-    sunet::server: *id016
+    sunet::server: *id017
     sunetops: null
   kvmdemw-fre-3a.komreg.net:
     common: null
@@ -728,6 +728,7 @@ classes:
           cpus: '8'
           description: eid tug redis cluster
           gateway: 94.176.224.1
+          image_url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
           ip: 94.176.224.9
           mac: '52:54:20:02:04:05'
           memory: '8192'
@@ -912,7 +913,7 @@ classes:
   log-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id017 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id018 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     eid::telegraf: null
     eidas_log: null
     entropyclient: null
@@ -920,7 +921,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: &id018 {udp_client: 94.176.224.0/24, udp_port: 514}
+    sunet::rsyslog: &id019 {udp_client: 94.176.224.0/24, udp_port: 514}
     sunet::server: *id002
     sunetops: null
   log-1.test.sveidas.se:
@@ -940,7 +941,7 @@ classes:
   log-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id017
+    eid::dockerhost: *id018
     eid::telegraf: null
     eidas_log: null
     entropyclient: null
@@ -948,7 +949,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: *id018
+    sunet::rsyslog: *id019
     sunet::server: *id002
     sunetops: null
   log.qa.sveidas.se:
@@ -1163,7 +1164,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: &id019 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid: &id020 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4}
     servicemonitor: null
     sunet::rsyslog: null
@@ -1172,7 +1173,7 @@ classes:
   prid-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id020 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id021 {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1191,7 +1192,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: *id019
+    prid: *id020
     servicemonitor: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1199,7 +1200,7 @@ classes:
   prid-2.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id020
+    eid::dockerhost: *id021
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1284,13 +1285,13 @@ classes:
   validator-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: &id021 {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
-    sunet::frontend::register_sites: &id022
+    sunet::frontend::register_sites: &id023
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1298,7 +1299,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id023 {version: 3.0.10}
+    validator: &id024 {version: 3.0.10}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1334,17 +1335,17 @@ classes:
   validator-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: *id021
+    eid::dockerhost: *id022
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id022
+    sunet::frontend::register_sites: *id023
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id023
+    validator: *id024
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null