diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 77aacb1a..ccbd63fa 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -444,7 +444,7 @@ classes:
   eumd-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
@@ -1011,7 +1011,7 @@ classes:
     eid::kvmhost:
       vms:
         eumd-1.komreg.net: {bridge: br-meta, cpus: '10', description: eid fre european
-            metadata signer, gateway: 94.176.224.193, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img',
+            metadata signer, gateway: 94.176.224.193, image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img',
           ip: 94.176.224.198, mac: '52:54:20:01:01:02', memory: '15360', netmask: 255.255.255.240}
         eupub-1.komreg.net: {bridge: br-meta, cpus: '10', description: eid fre european
             metadata publisher, gateway: 94.176.224.193, image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img',
@@ -1040,7 +1040,7 @@ classes:
             metadata publisher, gateway: 94.176.224.65, image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img',
           ip: 94.176.224.72, mac: '52:54:20:02:03:04', memory: '15360', netmask: 255.255.255.240}
         natmd-2.komreg.net: {bridge: br-meta, cpus: '10', description: eid tug swedish
-            metadata signer, gateway: 94.176.224.65, image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img',
+            metadata signer, gateway: 94.176.224.65, image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img',
           ip: 94.176.224.69, mac: '52:54:20:02:03:01', memory: '15360', netmask: 255.255.255.240}
         natpub-2.komreg.net: {bridge: br-meta, cpus: '10', description: eid tug swedish
             metadata publisher, gateway: 94.176.224.65, image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img',
@@ -1185,7 +1185,7 @@ classes:
   natmd-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.8~3-0~ubuntu-bionic'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null