diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 615ec7ad..7b834e71 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -54,23 +54,28 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
   jump-fre-3.komreg.net:
+    autoupdate: null
     common: null
     entropyclient: null
     infra_ca_rp: null
+    konsulter: null
     mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
   jump-tug-3.komreg.net:
+    autoupdate: null
     common: null
     entropyclient: null
     infra_ca_rp: null
+    konsulter: null
     mailclient: *id001
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
   kvmeidas-fre-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -79,6 +84,7 @@ classes:
     sunetops: null
   kvmeidas-tug-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -87,6 +93,7 @@ classes:
     sunetops: null
   kvmfe-fre-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -95,6 +102,7 @@ classes:
     sunetops: null
   kvmfe-tug-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -103,6 +111,7 @@ classes:
     sunetops: null
   kvminfra-fre-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -111,6 +120,7 @@ classes:
     sunetops: null
   kvminfra-tug-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -119,6 +129,7 @@ classes:
     sunetops: null
   kvmmeta-fre-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -127,6 +138,7 @@ classes:
     sunetops: null
   kvmmeta-tug-3.komreg.net:
     common: null
+    eid::kvmhost: null
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
@@ -234,13 +246,16 @@ members:
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
   autoupdate: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.qa.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
-    r1.komreg.net]
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
   common: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
     jump-fre-3.komreg.net, jump-tug-3.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, md-eu1.qa.komreg.net, md1.komreg.net,
     nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
+  eid::kvmhost: [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]
   eidas_connector: [eidas-node-1.qa.sveidas.se]
   eidas_proxy: [eidas-proxy-1.qa.sveidas.se]
   entropyclient: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
@@ -254,7 +269,8 @@ members:
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net,
     nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
   konsulter: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.qa.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se]
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net,
+    prid-1.qa.sveidas.se]
   mailclient: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
     jump-fre-3.komreg.net, jump-tug-3.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,