diff --git a/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
index 0865d33c..da0a3e5b 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/application-qa.yml.erb
@@ -86,20 +86,6 @@ credential:
           alias: sc_eidas_encrypt
           key-password: ${PKCS11_PIN}
         monitor: true
-      connector-hsm-md-sign:
-        name: "Connector HSM Metadata Signing Credential"
-        store-reference: pkcs11-store
-        key:
-          certificates: file:${CONNECTOR_DIRECTORY}/credentials/sctest2.crt
-          alias: sctest2
-          key-password: ${PKCS11_PIN}
-        monitor: true
-          #pem:
-          #oauth2:
-        # TODO: Fix certs
-        #name: "Connector OAuth2 Credential"
-        #certificates: file:${CONNECTOR_DIRECTORY}/credentials/oauth2.crt
-        # private-key: file:${CONNECTOR_DIRECTORY}/credentials/oauth2.key
     monitoring:
       enabled: true
       test-interval: 10m
@@ -112,14 +98,6 @@ connector:
   eu-metadata:
     location: https://test.md.eidas.swedenconnect.se/role/idp.xml
     validation-certificate: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt
-  eidas:
-    credentials:
-      # Use same as for IdP except for the metadata signing credential
-      metadata-sign:
-        pem:
-          name: "Credential Metadata Signing"
-          certificates: file:${CONNECTOR_DIRECTORY}/credentials/metadata.crt
-          private-key: file:${CONNECTOR_DIRECTORY}/credentials/metadata.key
   prid:
     policy-resource: file:${CONNECTOR_DIRECTORY}/prid/policy.properties
   idp:
@@ -161,9 +139,6 @@ saml:
         bundle: connector-sign
       encrypt:
         bundle: connector-encrypt
-      metadata-sign:
-        bundle: connector-hsm-md-sign
-      #future-sign: file:${CONNECTOR_DIRECTORY}/credentials/idp-signing.crt
     audit:
       in-memory:
         capacity: 1000