diff --git a/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
index 38dab816..d44828a9 100644
--- a/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
+++ b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
@@ -57,8 +57,8 @@ export IDP_ENCRYPTION_CERT="/etc/eidas-connector/credentials/connector.crt"
 #export IDP_ENCRYPTION_PKCS11_PIN=$PKCS11_PIN
 #export IDP_ENCRYPTION_CERT=$IDP_CREDENTIALS/enc.crt
 
-export IDP_METADATA_SIGNING_KEY="/etc/eidas-connector/credentials/connector.key"
-export IDP_METADATA_SIGNING_CERT="/etc/eidas-connector/credentials/connector.crt"
+export IDP_METADATA_SIGNING_KEY="/etc/eidas-connector/credentials/metadata.key"
+export IDP_METADATA_SIGNING_CERT="/etc/eidas-connector/credentials/metadata.crt"
 #export IDP_METADATA_SIGNING_PKCS11_ALIAS=swedenconnect
 #export IDP_METADATA_SIGNING_PKCS11_PIN=$PKCS11_PIN
 #export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/swedenconnect-signer.crt
@@ -66,7 +66,7 @@ export IDP_METADATA_SIGNING_CERT="/etc/eidas-connector/credentials/connector.crt
 export SP_CREDENTIALS=/etc/eidas-connector/credentials
 
 export SP_SIGNING_KEY="/etc/eidas-connector/credentials/connector.key"
-export SP_SIGNING_CERT="/etc/eidas-connector/credentials/connector.key"
+export SP_SIGNING_CERT="/etc/eidas-connector/credentials/connector.crt"
 #export SP_SIGNING_PKCS11_ALIAS=sc_eidas_sign
 #export SP_SIGNING_PKCS11_PIN=$PKCS11_PIN
 #export SP_SIGNING_CERT=$SP_CREDENTIALS/sign.crt
@@ -77,8 +77,8 @@ export SP_ENCRYPTION_CERT="/etc/eidas-connector/credentials/connector.crt"
 #export SP_ENCRYPTION_PKCS11_PIN=$PKCS11_PIN
 #export SP_ENCRYPTION_CERT=$SP_CREDENTIALS/enc.crt
 
-export SP_METADATA_SIGNING_KEY="/etc/eidas-connector/credentials/connector.key"
-export SP_METADATA_SIGNING_CERT="/etc/eidas-connector/credentials/connector.crt"
+export SP_METADATA_SIGNING_KEY="/etc/eidas-connector/credentials/metadata.key"
+export SP_METADATA_SIGNING_CERT="/etc/eidas-connector/credentials/metadata.crt"
 #export SP_METADATA_SIGNING_PKCS11_ALIAS=swedenconnect
 #export SP_METADATA_SIGNING_PKCS11_PIN=$PKCS11_PIN
 #export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/swedenconnect-signer.crt