diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 605cf7fc..a2d6b700 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -363,14 +363,14 @@ classes:
   eidas-test-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: &id013 {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: &id013
+    sunet::frontend::register_sites: &id014
       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: &id014 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1}
+    test_my_eid: &id015 {environment: prod, hostname: test.swedenconnect.se, version: 1.3.1}
   eidas-test-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: null
+    eid::dockerhost: *id013
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
     servicemonitor: null
-    sunet::frontend::register_sites: *id013
+    sunet::frontend::register_sites: *id014
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    test_my_eid: *id014
+    test_my_eid: *id015
   eidastest-1.qa.sveidas.se:
     autoupdate: null
     common: null
@@ -529,7 +529,7 @@ classes:
     metadatamgrs: null
     nrpe: null
     sunet::rsyslog: null
-    sunet::server: &id015 {ssh_allow_from_anywhere: true}
+    sunet::server: &id016 {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: *id015
+    sunet::server: *id016
     sunetops: null
   kvmdemw-fre-3a.komreg.net:
     common: null
@@ -550,7 +550,8 @@ classes:
       vms:
         demw-1.sveidas.se: {bridge: br-demw, cpus: '16', description: eid deutsche
             middleware, gateway: 94.176.224.249, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img',
-          ip: 94.176.224.252, mac: '52:54:20:01:05:01', memory: '102400', netmask: 255.255.255.248}
+          ip: 94.176.224.252, mac: '52:54:20:01:05:01', memory: '32768', netmask: 255.255.255.248,
+          size: 100G}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -756,6 +757,7 @@ classes:
           cpus: '8'
           description: eid tug test SP
           gateway: 94.176.224.1
+          image_url: https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img
           ip: 94.176.224.11
           mac: '52:54:20:02:04:07'
           memory: '8192'
@@ -909,7 +911,7 @@ classes:
   log-1.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id016 {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: &id017 {version: '5:20.10.8~3-0~ubuntu-bionic'}
     eid::telegraf: null
     eidas_log: null
     entropyclient: null
@@ -917,7 +919,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: &id017 {udp_client: 94.176.224.0/24, udp_port: 514}
+    sunet::rsyslog: &id018 {udp_client: 94.176.224.0/24, udp_port: 514}
     sunet::server: *id002
     sunetops: null
   log-1.test.sveidas.se:
@@ -937,7 +939,7 @@ classes:
   log-2.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id016
+    eid::dockerhost: *id017
     eid::telegraf: null
     eidas_log: null
     entropyclient: null
@@ -945,7 +947,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::rsyslog: *id017
+    sunet::rsyslog: *id018
     sunet::server: *id002
     sunetops: null
   log.qa.sveidas.se:
@@ -1160,7 +1162,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: &id018 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
+    prid: &id019 {clients: prid_prod_clients, mdsl: 'https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml',
       version: 1.0.4}
     servicemonitor: null
     sunet::rsyslog: null
@@ -1169,7 +1171,7 @@ classes:
   prid-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id019 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id020 {version: '5:20.10.6~3-0~ubuntu-focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1188,7 +1190,7 @@ classes:
     konsulter: null
     mailclient: *id001
     nrpe: null
-    prid: *id018
+    prid: *id019
     servicemonitor: null
     sunet::rsyslog: null
     sunet::server: *id002
@@ -1196,7 +1198,7 @@ classes:
   prid-2.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: *id019
+    eid::dockerhost: *id020
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1281,13 +1283,13 @@ classes:
   validator-1.komreg.net:
     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
-    sunet::frontend::register_sites: &id021
+    sunet::frontend::register_sites: &id022
       sites:
         validator.swedenconnect.se:
           frontends: [fe-fre-3.komreg.net, fe-tug-3.komreg.net]
@@ -1295,7 +1297,7 @@ classes:
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: &id022 {version: 3.0.10}
+    validator: &id023 {version: 3.0.10}
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
@@ -1331,17 +1333,17 @@ classes:
   validator-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: *id020
+    eid::dockerhost: *id021
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    sunet::frontend::register_sites: *id021
+    sunet::frontend::register_sites: *id022
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
-    validator: *id022
+    validator: *id023
   web-1.qa.sveidas.se:
     autoupdate: null
     common: null