diff --git a/eidas-test-connector/overlay/opt/eidas-connector/credentials/sc-test-signer.crt b/eidas-test-connector/overlay/opt/eidas-connector/credentials/sc-test-md-signer.crt
similarity index 100%
rename from eidas-test-connector/overlay/opt/eidas-connector/credentials/sc-test-signer.crt
rename to eidas-test-connector/overlay/opt/eidas-connector/credentials/sc-test-md-signer.crt
diff --git a/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
index 64f6099d..027c6747 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
@@ -103,7 +103,7 @@ connector:
   backup-directory: ${CONNECTOR_DIRECTORY}/backup
   eu-metadata:
     location: https://<%= @environment %>.md.eidas.swedenconnect.se/role/idp.xml
-    validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt
+    validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-<%= @environment %>-md-signer.crt
   prid:
     policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties
   idp:
@@ -138,7 +138,7 @@ saml:
     metadata-providers:
       - location: https://<%= @environment %>.md.swedenconnect.se/role/sp.xml
         backup-location: ${connector.backup-directory}/metadata/sc-cache.xml
-        validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-test-signer.crt
+        validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/sc-<%= @environment %>-md-signer.crt
     credentials:
       # Use same as for IdP except for the metadata signing credential
       sign: