diff --git a/eidas-qa-proxy/overlay/opt/se/cache/.placeholder b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cache/.placeholder
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cache/.placeholder
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cache/.placeholder
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/application-se.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/application-se.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/application-se.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/application-se.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/general-metadata.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/general-metadata.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/general-metadata.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/general-metadata.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/idpdisco.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/idpdisco.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/idpdisco.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/idpdisco.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/img/favicon.ico b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/favicon.ico
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/img/favicon.ico
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/favicon.ico
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/img/idp-logo-notext.svg b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/idp-logo-notext.svg
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/img/idp-logo-notext.svg
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/idp-logo-notext.svg
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/img/idp-logo.svg b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/idp-logo.svg
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/img/idp-logo.svg
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/idp-logo.svg
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/img/sweden-connect-color-yellow-on-blue-no-text.svg b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/sweden-connect-color-yellow-on-blue-no-text.svg
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/img/sweden-connect-color-yellow-on-blue-no-text.svg
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/sweden-connect-color-yellow-on-blue-no-text.svg
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/img/sweden-connect-color-yellow-on-blue.svg b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/sweden-connect-color-yellow-on-blue.svg
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/img/sweden-connect-color-yellow-on-blue.svg
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/img/sweden-connect-color-yellow-on-blue.svg
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/infotext.md b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/infotext.md
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/infotext.md
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/infotext.md
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/metadata.crt b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/metadata.crt
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/metadata.crt
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/metadata.crt
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/natsp-metadata.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/natsp-metadata.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/natsp-metadata.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/natsp-metadata.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/oidc-rp.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/oidc-rp.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/oidc-rp.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/oidc-rp.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/psidp-metadata.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/psidp-metadata.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/psidp-metadata.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/psidp-metadata.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/se-metadata-cert.crt b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/se-metadata-cert.crt
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/se-metadata-cert.crt
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/se-metadata-cert.crt
diff --git a/eidas-qa-proxy/overlay/opt/se/cfg/syslog.properties b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/syslog.properties
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/cfg/syslog.properties
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/cfg/syslog.properties
diff --git a/eidas-qa-proxy/overlay/opt/se/metadata/oidc/bid-op-jwks.json b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/metadata/oidc/bid-op-jwks.json
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/metadata/oidc/bid-op-jwks.json
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/metadata/oidc/bid-op-jwks.json
diff --git a/eidas-qa-proxy/overlay/opt/se/metadata/oidc/bid-op-metadata.json b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/metadata/oidc/bid-op-metadata.json
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/metadata/oidc/bid-op-metadata.json
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/metadata/oidc/bid-op-metadata.json
diff --git a/eidas-qa-proxy/overlay/opt/se/ps-mdcache/.placeholder b/eidas-qa-proxy/overlay/opt/eidas-proxy/se/ps-mdcache/.placeholder
similarity index 100%
rename from eidas-qa-proxy/overlay/opt/se/ps-mdcache/.placeholder
rename to eidas-qa-proxy/overlay/opt/eidas-proxy/se/ps-mdcache/.placeholder