diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index a2843b73..801f9cee 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -47,7 +47,7 @@ classes:
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
-  md-eu1.komreg.net:
+  md-eu1.qa.komreg.net:
     autoupdate: null
     common: null
     entropyclient: null
@@ -55,7 +55,7 @@ classes:
     konsulter: null
     mailclient: *id001
     md_repo_client: null
-    md_signer: {dest_host: p2.qa.komreg.net, name: eidas}
+    md_signer: {dest_host: p2.qa.komreg.net, name: eidas-qa}
     nrpe: null
     openstack_dockerhost: null
     sunet::rsyslog: null
@@ -137,50 +137,50 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
 members:
-  all: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, md-eu1.komreg.net,
+  all: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.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.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    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,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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]
   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,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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]
   infra_ca_rp: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se]
+    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,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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]
   md_publisher: [p1.komreg.net, p2.qa.komreg.net]
-  md_repo_client: [md-eu1.komreg.net]
+  md_repo_client: [md-eu1.qa.komreg.net]
   md_repo_server: [r1.komreg.net]
-  md_signer: [md-eu1.komreg.net, md1.komreg.net]
+  md_signer: [md-eu1.qa.komreg.net, md1.komreg.net]
   nagios_monitor: [nic.komreg.net]
   nrpe: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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]
   openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
-    md-eu1.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
+    md-eu1.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
   prid: [prid-1.qa.sveidas.se]
   servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se]
   sunet::dehydrated: [r1.komreg.net]
   sunet::frontend::register_sites: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     p1.komreg.net]
   sunet::rsyslog: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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]
   sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
+    md-eu1.qa.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
     r1.komreg.net]
   sunetops: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.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]