diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 27dc4edd..3ae57cb2 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -966,6 +966,7 @@ classes:
   md1.komreg.net:
     autoupdate: null
     common: null
+    eid::dockerhost: {version: '5:20.10.7~3-0~ubuntu-focal'}
     eidas_metadata_key: null
     entropyclient: null
     infra_ca_rp: null
@@ -974,7 +975,6 @@ classes:
     md_signer: {dest_host: p1.komreg.net, name: natmd-qa, version: eidas-qa}
     metadatamgrs: null
     nrpe: null
-    openstack_dockerhost: null
     sunet::rsyslog: null
     sunet::server: *id002
     sunet_iaas_cloud: null
@@ -1412,8 +1412,8 @@ members:
     eidas-redis-4.sveidas.se, eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se,
     eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, eidastest-1.qa.sveidas.se, eumd-1.komreg.net,
     eumd-2.komreg.net, fe-fre-3.komreg.net, fe-tug-3.komreg.net, log-1.sveidas.se,
-    log-2.sveidas.se, log.qa.sveidas.se, monitor-tug-3.komreg.net, natmd-1.komreg.net,
-    natmd-2.komreg.net, nic.komreg.net, prid-1.sveidas.se, prid-1.test.sveidas.se,
+    log-2.sveidas.se, log.qa.sveidas.se, md1.komreg.net, monitor-tug-3.komreg.net,
+    natmd-1.komreg.net, natmd-2.komreg.net, nic.komreg.net, prid-1.sveidas.se, prid-1.test.sveidas.se,
     prid-2.sveidas.se, prid-2.test.sveidas.se, refidp-1.qa.sveidas.se, test-1.qa.sveidas.se,
     test-1.test.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net,
     validator-2.komreg.net]
@@ -1543,7 +1543,7 @@ members:
     validator-1.komreg.net, validator-1.qa.komreg.net, validator-1.test.komreg.net,
     validator-2.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [eidas-node-1.qa.sveidas.se, md-eu1.qa.komreg.net, md-eu1.qa.komreg.net,
-    md1.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   pages: [web-1.qa.sveidas.se]
   prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se]
   redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,