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 341811c1..2a184f70 100644
--- a/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
+++ b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
@@ -39,50 +39,33 @@ export IDP_SEALER_STORE_RESOURCE=$IDP_CREDENTIALS/sealer.jks
 export IDP_SEALER_VERSION_RESOURCES=$IDP_CREDENTIALS/sealer.kver
 
 export IDP_PKCS11_ENABLED=true
+export IDP_PKCS11_PIN=$PKCS11_PIN
 export IDP_METADATA_SIGNING_PKCS11_ENABLED=true
 export SP_METADATA_SIGNING_PKCS11_ENABLED=true
 
-#export IDP_SIGNING_KEY="/etc/eidas-connector/credentials/connector.key"
-#export IDP_SIGNING_CERT="/etc/eidas-connector/credentials/connector.crt"
 export IDP_SIGNING_PKCS11_ALIAS=sc_eidas_sign
-export IDP_SIGNING_PKCS11_PIN=$PKCS11_PIN
 export IDP_SIGNING_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
 export IDP_SIGNING_CERT=$IDP_CREDENTIALS/sign.crt
 
-#export IDP_ENCRYPTION_KEY="/etc/eidas-connector/credentials/connector.key"
-#export IDP_ENCRYPTION_CERT="/etc/eidas-connector/credentials/connector.crt"
 export IDP_ENCRYPTION_PKCS11_ALIAS=sc_eidas_encrypt
-export IDP_ENCRYPTION_PKCS11_PIN=$PKCS11_PIN
 export IDP_ENCRYPTION_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
 export IDP_ENCRYPTION_CERT=$IDP_CREDENTIALS/enc.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_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
 export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/swedenconnect-signer.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.crt"
 export SP_SIGNING_PKCS11_ALIAS=sc_eidas_sign
-export SP_SIGNING_PKCS11_PIN=$PKCS11_PIN
 export SP_SIGNING_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
 export SP_SIGNING_CERT=$SP_CREDENTIALS/sign.crt
 
-#export SP_ENCRYPTION_KEY="/etc/eidas-connector/credentials/connector.key"
-#export SP_ENCRYPTION_CERT="/etc/eidas-connector/credentials/connector.crt"
 export SP_ENCRYPTION_PKCS11_ALIAS=sc_eidas_encrypt
-export SP_ENCRYPTION_PKCS11_PIN=$PKCS11_PIN
 export SP_ENCRYPTION_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
 export SP_ENCRYPTION_CERT=$SP_CREDENTIALS/enc.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_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
 export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/swedenconnect-signer.crt
 
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 7be5b0f2..a749088d 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -570,7 +570,7 @@ md-eu1.qa.komreg.net:
    konsulter:
    autoupdate:
    eidas_connector:
-     version: 1.3.6
+     version: 1.3.7
      hostname: connector.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites: