diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index eb5cc51b..9553cbe8 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -9,25 +9,29 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
   jmp.komreg.net:
+    autoupdate: null
     common: null
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
+    sunet_iaas_cloud: null
     sunetops: null
   r1.komreg.net:
+    autoupdate: null
     common: null
     infra_ca_rp: null
     mailclient: *id001
     nrpe: null
+    sunet_iaas_cloud: null
     sunetops: null
 members:
   all: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
-  autoupdate: [eidas-node-1.qa.sveidas.se]
+  autoupdate: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
   common: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
   infra_ca_rp: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
   mailclient: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
   nrpe: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
   openstack_ubuntu_16_04_dockerhost: [eidas-node-1.qa.sveidas.se]
-  sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se]
+  sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]
   sunetops: [eidas-node-1.qa.sveidas.se, jmp.komreg.net, r1.komreg.net]