diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index c3639a04..39e09d7b 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -48,14 +48,6 @@ classes:
     sunet_iaas_cloud: null
     sunetops: null
   md-eu1.komreg.net:
-    common: null
-    entropyclient: null
-    infra_ca_rp: null
-    mailclient: *id001
-    nrpe: null
-    sunet::rsyslog: null
-    sunetops: null
-  md1.komreg.net:
     autoupdate: null
     common: null
     entropyclient: null
@@ -63,12 +55,20 @@ classes:
     konsulter: null
     mailclient: *id001
     md_repo_client: null
-    md_signer: {dest_host: p1.komreg.net, name: natmd-qa}
     nrpe: null
     openstack_ubuntu_16_04_dockerhost: null
     sunet::rsyslog: null
     sunet_iaas_cloud: null
     sunetops: null
+  md1.komreg.net:
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    md_signer: {dest_host: p1.komreg.net, name: natmd-qa}
+    nrpe: null
+    sunet::rsyslog: null
+    sunetops: null
   nic.komreg.net:
     autoupdate: null
     common: null
@@ -127,7 +127,7 @@ members:
   all: [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, prid-1.qa.sveidas.se, r1.komreg.net]
   autoupdate: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    md1.komreg.net, nic.komreg.net, p1.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
+    md-eu1.komreg.net, nic.komreg.net, p1.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, prid-1.qa.sveidas.se,
     r1.komreg.net]
@@ -140,12 +140,12 @@ members:
     md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.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,
-    md1.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se]
+    md-eu1.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, prid-1.qa.sveidas.se,
     r1.komreg.net]
   md_publisher: [p1.komreg.net]
-  md_repo_client: [md1.komreg.net]
+  md_repo_client: [md-eu1.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [md1.komreg.net]
   nagios_monitor: [nic.komreg.net]
@@ -153,7 +153,7 @@ members:
     md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, prid-1.qa.sveidas.se,
     r1.komreg.net]
   openstack_ubuntu_16_04_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
-    md1.komreg.net, prid-1.qa.sveidas.se]
+    md-eu1.komreg.net, prid-1.qa.sveidas.se]
   prid: [prid-1.qa.sveidas.se]
   servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se]
   sunet::dehydrated: [r1.komreg.net]
@@ -163,7 +163,7 @@ members:
     md-eu1.komreg.net, md1.komreg.net, nic.komreg.net, p1.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,
-    md1.komreg.net, nic.komreg.net, p1.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net]
+    md-eu1.komreg.net, nic.komreg.net, p1.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, prid-1.qa.sveidas.se,
     r1.komreg.net]