diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index e2b9ede6..a76d7b42 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -104,7 +104,7 @@ kvmmeta-tug-3.komreg.net:
             description: 'eid tug swedish metadata signer'
             cpus: '10'
             memory: '15360'
-            image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img'
+            image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
          eumd-2.komreg.net:
             mac: '52:54:20:02:03:02'
             ip: '94.176.224.70'
@@ -324,7 +324,7 @@ kvmmeta-fre-3.komreg.net:
             description: 'eid fre european metadata signer'
             cpus: '10'
             memory: '15360'
-            image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img'
+            image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img'
          natpub-1.komreg.net:
             mac: '52:54:20:01:01:03'
             ip: '94.176.224.199'
@@ -518,7 +518,7 @@ natmd-test-1.komreg.net:
 eumd-1.komreg.net:
    autoupdate:
    eid::dockerhost:
-      version: '5:20.10.8~3-0~ubuntu-bionic'
+      version: '5:23.0.6-1~ubuntu.20.04~focal'
    metadatamgrs:
    konsulter:
    eidas_hsm_client:
@@ -598,7 +598,7 @@ eupub-test-1.komreg.net:
 natmd-2.komreg.net:
    autoupdate:
    eid::dockerhost:
-      version: '5:20.10.8~3-0~ubuntu-bionic'
+      version: '5:23.0.6-1~ubuntu.20.04~focal'
    metadatamgrs:
    konsulter:
    eidas_hsm_client: