diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index e8872dc6..891bd79a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -58,9 +58,9 @@ md1.komreg.net:
       name: natmd-qa
       dest_host: p1.komreg.net
 
-md-eu1.komreg.net:
+md-eu1.qa.komreg.net:
    md_signer:
-      name: eidas
+      name: eidas-qa
       dest_host: p2.qa.komreg.net
 
 '^eidas-node-[0-9]+\.qa\.sveidas\.se$':
diff --git a/md-eu1.komreg.net/README b/md-eu1.qa.komreg.net/README
similarity index 100%
rename from md-eu1.komreg.net/README
rename to md-eu1.qa.komreg.net/README
diff --git a/md-eu1.komreg.net/overlay/etc/credentials/metadata.crt b/md-eu1.qa.komreg.net/overlay/etc/credentials/metadata.crt
similarity index 100%
rename from md-eu1.komreg.net/overlay/etc/credentials/metadata.crt
rename to md-eu1.qa.komreg.net/overlay/etc/credentials/metadata.crt
diff --git a/md-eu1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/md-eu1.qa.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
similarity index 100%
rename from md-eu1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
rename to md-eu1.qa.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc
diff --git a/md-eu1.komreg.net/overlay/etc/mirror-mdq/post.d/10-template.sh b/md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/post.d/10-template.sh
similarity index 100%
rename from md-eu1.komreg.net/overlay/etc/mirror-mdq/post.d/10-template.sh
rename to md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/post.d/10-template.sh
diff --git a/md-eu1.komreg.net/overlay/etc/mirror-mdq/template/css/bootstrap.min.css b/md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
similarity index 100%
rename from md-eu1.komreg.net/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
rename to md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/template/css/bootstrap.min.css
diff --git a/md-eu1.komreg.net/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg b/md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
similarity index 100%
rename from md-eu1.komreg.net/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
rename to md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/template/img/e-log_liggande_webb.svg
diff --git a/md-eu1.komreg.net/overlay/etc/mirror-mdq/template/index.html b/md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/template/index.html
similarity index 100%
rename from md-eu1.komreg.net/overlay/etc/mirror-mdq/template/index.html
rename to md-eu1.qa.komreg.net/overlay/etc/mirror-mdq/template/index.html
diff --git a/md-eu1.komreg.net/overlay/usr/local/bin/mirror-mdq.sh b/md-eu1.qa.komreg.net/overlay/usr/local/bin/mirror-mdq.sh
similarity index 100%
rename from md-eu1.komreg.net/overlay/usr/local/bin/mirror-mdq.sh
rename to md-eu1.qa.komreg.net/overlay/usr/local/bin/mirror-mdq.sh