diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 207391e2..b0706ffe 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -235,7 +235,7 @@ classes:
   eidas-proxy-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: &id013 {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: &id013 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eid::telegraf: null
     eidas_proxy: &id014 {hostname: test.proxy.eidas.swedenconnect.se, spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION,
       version: 1.4.7_hsm2_ubuntu}
@@ -476,7 +476,7 @@ classes:
   eumd-test-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
@@ -492,7 +492,7 @@ classes:
   eumd-test-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
@@ -575,7 +575,7 @@ classes:
     sunetops: null
   fe-fre-1.test.komreg.net:
     common: null
-    eid::dockerhost: &id022 {version: '5:23.0.1-1~ubuntu.20.04~focal'}
+    eid::dockerhost: &id022 {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     fe_servers: null
     infra_ca_rp: null
@@ -1113,7 +1113,7 @@ classes:
   md-eu1.qa.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.7~3-0~ubuntu-bionic'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_metadata_key: null
     entropyclient: null
     infra_ca_rp: null
@@ -1202,7 +1202,7 @@ classes:
   natmd-test-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
@@ -1218,7 +1218,7 @@ classes:
   natmd-test-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
@@ -1463,7 +1463,7 @@ classes:
   test-1.test.sveidas.se:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1533,7 +1533,7 @@ classes:
   validator-test-1.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null