diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index dd84d9b4..3f1fc0c1 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1174,12 +1174,12 @@ classes:
   validator-1.qa.komreg.net:
     autoupdate: null
     common: null
+    eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-bionic'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
     nrpe: null
-    openstack_dockerhost: null
     sunet::frontend::register_sites:
       sites:
         swedenconnect.se:
@@ -1285,7 +1285,7 @@ members:
     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]
+    test-1.qa.sveidas.se, validator-1.komreg.net, validator-1.qa.komreg.net, validator-2.komreg.net]
   eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net]
@@ -1397,8 +1397,7 @@ 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, 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]
+    md1.komreg.net, 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,