diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/idp/idp-encryption.crt b/eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/idp/idp-encryption.crt
rename to eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/idp/idp-signing.crt b/eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/idp/idp-signing.crt
rename to eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/idp/metadata-signing.crt b/eidas-node/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/idp/metadata-signing.crt
rename to eidas-node/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/sp/metadata-signing.crt b/eidas-node/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/sp/metadata-signing.crt
rename to eidas-node/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/sp/sp-encryption.crt b/eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/sp/sp-encryption.crt
rename to eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/sp/sp-signing.crt b/eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/sp/sp-signing.crt
rename to eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/tomcat/tomcat-cert.pem b/eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/tomcat/tomcat-cert.pem
rename to eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
diff --git a/eidas-node/overlay/etc/eidas-connector/qa-credentials/tomcat/tomcat-chain.pem b/eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/qa-credentials/tomcat/tomcat-chain.pem
rename to eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem