diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cache/.placeholder
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cache/.placeholder
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/infotext.md
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/infotext.md
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/metadata.crt
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/metadata.crt
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
similarity index 85%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
index baab65d7..4f7260dc 100644
--- a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
@@ -10,7 +10,8 @@ natsp.descriptions={\
   }
 # Logos are specified as a map with the url as key followed by  height,width[,lang] as comma separated parameters.
 natsp.logos={\
-  'https://eunode.eidastest.se/Connector/custom/idpLogo.png':'276,293'\
+  '${proxy-service.domain.prefix}/img/logo_full.png':'432,547',\
+  '${proxy-service.domain.prefix}/img/logo_notext_h67.png':'279,278'\
   }
 natsp.assertionConsumerServices={\
   'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder b/eidas-proxy-common/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
rename to eidas-proxy-common/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/application.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/application.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/infotext.md
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/infotext.md
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
similarity index 100%
rename from eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
rename to eidas-proxy-common/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
index baab65d7..4f7260dc 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
@@ -10,7 +10,8 @@ natsp.descriptions={\
   }
 # Logos are specified as a map with the url as key followed by  height,width[,lang] as comma separated parameters.
 natsp.logos={\
-  'https://eunode.eidastest.se/Connector/custom/idpLogo.png':'276,293'\
+  '${proxy-service.domain.prefix}/img/logo_full.png':'432,547',\
+  '${proxy-service.domain.prefix}/img/logo_notext_h67.png':'279,278'\
   }
 natsp.assertionConsumerServices={\
   'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\