diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 60155b03..2eb208ec 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -483,7 +483,7 @@ classes:
     sunetops: null
   fe-fre-3.komreg.net:
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: &id019 {version: '5:20.10.9~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -494,7 +494,7 @@ classes:
     sunetops: null
   fe-tug-3.komreg.net:
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: *id019
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -529,7 +529,7 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
-    sunet::server: &id019 {ssh_allow_from_anywhere: true}
+    sunet::server: &id020 {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: *id019
+    sunet::server: *id020
     sunetops: null
   kvmdemw-fre-3a.komreg.net:
     common: null
@@ -798,8 +798,8 @@ classes:
     eid::kvmhost:
       vms:
         fe-fre-3.komreg.net: {bridge: br-fe, cpus: '15', description: eid fre frontend,
-          gateway: 94.176.224.161, ip: 94.176.224.165, mac: '52:54:20:01:00:01', memory: '30720',
-          netmask: 255.255.255.240}
+          gateway: 94.176.224.161, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img',
+          ip: 94.176.224.165, mac: '52:54:20:01:00:01', memory: '30720', netmask: 255.255.255.240}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -1171,13 +1171,13 @@ classes:
   prid-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id020 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id021 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: &id021 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid: &id022 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4}
     servicemonitor: null
     sunet::rsyslog: null
@@ -1186,7 +1186,7 @@ classes:
   prid-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id022 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id023 {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1199,13 +1199,13 @@ classes:
   prid-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id020
+    eid::dockerhost: *id021
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: *id021
+    prid: *id022
     servicemonitor: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1213,7 +1213,7 @@ classes:
   prid-2.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id022
+    eid::dockerhost: *id023
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1298,13 +1298,13 @@ classes:
   validator-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: &id023 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id024 {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: &id024
+    sunet::frontend::register_sites: &id025
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1312,7 +1312,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id025 {version: 3.0.10}
+    validator: &id026 {version: 3.0.10}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1348,17 +1348,17 @@ classes:
   validator-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: *id023
+    eid::dockerhost: *id024
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id024
+    sunet::frontend::register_sites: *id025
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id025
+    validator: *id026
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null