diff --git a/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh b/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
index c29183c7..23b1e26d 100755
--- a/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
+++ b/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
@@ -2,7 +2,7 @@
 
 KEY=http://eidas_hsm_client_hsmproxy.docker:8000/swedenconnect/swedenconnect
 CERT=/etc/credentials/swedenconnect-signer.crt
-CONTAINER=pyff-eidas-prod
+CONTAINER=pyff-eidas-test
 
-/opt/metadata/scripts/mk_mdsl.sh /opt/metadata/eidas-prod.xml $KEY $CERT $CONTAINER > mdservicelist-aggregate.xml
-/opt/metadata/scripts/mk_mdsl.sh /opt/metadata/eidas-se-prod.xml $KEY $CERT $CONTAINER > mdservicelist-se.xml
+/opt/metadata/scripts/mk_mdsl.sh /opt/metadata/eidas-test.xml $KEY $CERT $CONTAINER > mdservicelist-aggregate.xml
+/opt/metadata/scripts/mk_mdsl.sh /opt/metadata/eidas-se-test.xml $KEY $CERT $CONTAINER > mdservicelist-se.xml
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index f08e8c02..727d6478 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -529,6 +529,11 @@ eumd-test-1.komreg.net:
       version: '5:20.10.6~3-0~ubuntu-focal'
    metadatamgrs:
    konsulter:
+   md_signer:
+      name: eidas-test
+      dest_host: eupub-test-1.komreg.net
+      version: 1.1.5-eidas
+   md_repo_client:
 
 natpub-1.komreg.net:
    autoupdate:
@@ -619,6 +624,11 @@ eumd-test-2.komreg.net:
       version: '5:20.10.6~3-0~ubuntu-focal'
    metadatamgrs:
    konsulter:
+   md_signer:
+      name: eidas-test
+      dest_host: eupub-test-2.komreg.net
+      version: 1.1.5-eidas
+   md_repo_client:
 
 natpub-2.komreg.net:
    autoupdate: