diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/connector.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/connector.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/connector.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/connector.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/idp/sealer.kver b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/sealer.kver
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/idp/sealer.kver
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/idp/sealer.kver
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/metadata.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/metadata.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/metadata.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/metadata.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/sealer.kver b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/sealer.kver
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/sealer.kver
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/sealer.kver
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/test-metadata.crt b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/test-metadata.crt
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/test-metadata.crt
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/test-metadata.crt
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
diff --git a/eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem b/eidas-qa-connector/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem
rename to eidas-qa-connector/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem
diff --git a/eidas-node/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/eidas-connector.conf
rename to eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf
diff --git a/eidas-node/overlay/etc/eidas-connector/loglevels.xml b/eidas-qa-connector/overlay/etc/eidas-connector/loglevels.xml
similarity index 100%
rename from eidas-node/overlay/etc/eidas-connector/loglevels.xml
rename to eidas-qa-connector/overlay/etc/eidas-connector/loglevels.xml
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt b/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
similarity index 100%
rename from eidas-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
rename to eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt