diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 5ef713e2..f6a4dd31 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -337,12 +337,12 @@ classes:
   eidastest-1.qa.sveidas.se:
     autoupdate: null
     common: null
+    eid::dockerhost: {version: 20.10.5~3-0~ubuntu-xenial}
     eidastest: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
-    openstack_dockerhost: {docker_version: '5:20.10.5~3-0~ubuntu-xenial'}
     sunet::frontend::register_sites:
       sites:
         api.swedenconnect.se:
@@ -1281,8 +1281,8 @@ members:
     eidas-proxy-4.sveidas.se, eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se,
     eidas-redis-3.sveidas.se, 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,
-    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,
+    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-2.sveidas.se,
     refidp-1.qa.sveidas.se, test-1.qa.sveidas.se, validator-1.komreg.net, validator-2.komreg.net]
   eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
@@ -1396,8 +1396,8 @@ members:
     test-1.qa.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net,
     web-1.qa.sveidas.se]
   openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
-    eidastest-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, validator-1.qa.komreg.net, web-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, validator-1.qa.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,