diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
index 546cd70d..dbab3852 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
@@ -22,4 +22,8 @@ psmd.idp.supportedAttributes=\
http://eidas.europa.eu/attributes/naturalperson/DateOfBirth,\
http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier,\
http://eidas.europa.eu/attributes/naturalperson/Gender
-psmd.idp.assuranceCertifications=http://eidas.europa.eu/LoA/substantial
\ No newline at end of file
+psmd.idp.assuranceCertifications=\
+ http://eidas.europa.eu/LoA/high,\
+ http://eidas.europa.eu/LoA/NotNotified/low,\
+ http://eidas.europa.eu/LoA/NotNotified/substantial,\
+ http://eidas.europa.eu/LoA/NotNotified/high
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/application.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/application.properties
deleted file mode 100644
index 57651243..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/application.properties
+++ /dev/null
@@ -1,81 +0,0 @@
-# Logging
-logging.level.org.springframework.web=INFO
-
-# Service path
-server.context-path=/eidas-ps
-
-proxy-service.path.prefix=${spring.config.location}..
-proxy-service.config.location=file://${spring.config.location}
-
-# Service port connector settings
-server.port=8443
-#server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12
-#server.ssl.key-store-type=PKCS12
-#server.ssl.key-store-password=secret
-#server.ssl.key-password=secret
-
-tomcat.ajp.port=8009
-tomcat.ajp.remoteauthentication=false
-tomcat.ajp.enabled=true
-
-# For development. Allowing signature check on metadata to be skipped. Default false.
-#proxy-service.dev.ignoreMetadataSignCheck=true
-
-# Initial delay in milliseconds (default 5000) and seconds between metadata configuration recache (default 240 sec).
-#proxy-service.daemon.inital.delay.ms=5000
-proxy-service.daemon.recache.delay.sec=240
-
-# Location of other properties files (general-metadata.properties, psidp-metadata.properties and natsp-metadata.properties)
-# Example specifying external location: 'proxy-service.config.location=file:///opt/webapp/eidas-ps/cfg/'
-# Example specifying src/main/resources config location: 'classpath:'
-
-
-# Key Store properties
-# Location can be specified as "classpath:" or as file path e.g "/opt/webapp/eidas-ps/keystore/keyStore.jks"
-proxy-service.keySourceType=jks
-proxy-service.keySourceLocation=${proxy-service.path.prefix}/nodeKeyStore.jks
-proxy-service.keySourcePass=local-demo
-proxy-service.keySourceAlias=local-demo-cert
-
-# Session Encryption properties
-#proxy-service.cookieEncryptPw=changeme
-
-# Requirements to show consent dialogue (Default false);
-proxy-service.consent=true
-proxy-service.consent.attributes=urn:oid:1.2.752.201.3.7,\
- urn:oid:2.5.4.4,\
- urn:oid:2.5.4.42,\
- urn:oid:1.3.6.1.5.5.7.9.3,\
- urn:oid:1.3.6.1.5.5.7.9.1
-proxy-service.consent.valuetranslation=urn:oid:1.3.6.1.5.5.7.9.3
-
-# Welcome page presentation text location
-proxy-service.welcomepage.markdown=${proxy-service.path.prefix}/cfg/infotext.md
-
-#Metadata Service List location specified as either URL (http or https), "file://" or "classpath:"
-proxy-service.eidasMdListLocation=https://eid.svelegtest.se/nodeconfig/mdservicelist
-
-# Optional certificate file for validating metadata service list file signatures
-# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set
-proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/eIDASmdListCert.crt
-
-#Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:"
-proxy-service.eidasMetadataLocation=https://eid.svelegtest.se/nodeconfig/metadata
-
-# Optional certificate file for validating metadata signatures
-# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set
-proxy-service.eidasMetadataCertFile=${proxy-service.path.prefix}/eIDASmdListCert.crt
-
-# Optional cache dir for caching downloaded metadata. If not set, cache is stored in memory.
-proxy-service.eidasMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache
-
-
-#Metadata location for national IdP metadata specified as either URL (http or https), "file://" or "classpath:"
-proxy-service.nationalMetadataLocation=http://eid.svelegtest.se/metadata/mdx/role/idp.xml
-
-# Optional certificate file for validating metadata signatures
-# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set
-proxy-service.nationalMetadataCert=${proxy-service.path.prefix}/se-metadata-cert.crt
-
-# Optional cache dir for caching downloaded national metadata. If not set, cache is stored in memory.
-proxy-service.nationalPsMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
deleted file mode 100644
index ef5cf22f..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-psgen.country=XY
-psgen.name=Sweden XY eIDAS ProxyService
-psgen.orgName=Swedish E-Identification Board
-psgen.dispName=Swedish eIDAS Proxy Service
-psgen.orgUrl=http://eidasweb.se
-psgen.supportGivenName=Customer support
-psgen.techGivenName=Technical support
-psgen.supportEmail=support@example.com
-psgen.techEmail=support@example.com
-
-
-
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/infotext.md b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/infotext.md
deleted file mode 100644
index bfc4503d..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/infotext.md
+++ /dev/null
@@ -1,44 +0,0 @@
-### Proxy Service
-
-This is the Swedish XY Country test proxy sevice of the Swedish eIDAS Pilot
-
-**Relevant resources:**
-
-
-**Metadata validation certificate:**
-
-
-```
------BEGIN CERTIFICATE-----
-MIIDOzCCAiMCBgFfWGgYvjANBgkqhkiG9w0BAQ0FADBhMSkwJwYDVQQDEyBUZXN0IENvdW50cnkg
-ZUlEQVMgUHJveHkgU2VydmljZTEnMCUGA1UEChMeU3dlZGlzaCBFLUlkZW50aWZpY2F0aW9uIEJv
-YXJkMQswCQYDVQQGEwJYWTAeFw0xNzEwMjYwOTE4NTdaFw0yMjEwMjYxMTE4NTdaMGExKTAnBgNV
-BAMTIFRlc3QgQ291bnRyeSBlSURBUyBQcm94eSBTZXJ2aWNlMScwJQYDVQQKEx5Td2VkaXNoIEUt
-SWRlbnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYTAlhZMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAoo+9Fjjtx50yc8QzkFHxmRDqZC3/cPvWNIK0bqmXrBdlvstB5kYn0x+t644d9zQA
-v6yXFW3hhSHjTeeB49NVwa2HVxtmkX5VzJLNo0mjQm3c3vAZNooUHzv+deZrl5HhFkZZPD1sLwOb
-dlCHd1ozf60+diD/P0EkMkCwwaVWnq13pHv1XuQOBFmVb0O5/muJrzu6uGZAsPS4SUsg9IFgl1AK
-hcl5FPykNvqYMEamOKCbJoL2mpjUQFGtudlDaqneqz0Jt4syoQmvuFal/0uC1XhKwLNitu3GGceZ
-Mwdq6TJlR1pMNDgFOjSO2Yv0v/3kKtmhiOCBpmXXl4JcWDCMBQIDAQABMA0GCSqGSIb3DQEBDQUA
-A4IBAQBTCQT2OTGE+f5qWe4NiXRZBHfLuU0A2Lj3fm30dA+N/3WO5eOTHCGSEJhSh/SxeFzexTiG
-QSrdUuJtTM+mtqF6v0OfJ55K+dhSNzcE5dtM3ds6qZ73VAJQlxLv3qE4hqR7bLMhvz0Zby0Hq0XJ
-+FCMs5vSMDtMi5n/CLqh/ctEacUx+lNfQEjZWHInfntMBRUxwy6SYfqjPdhDneP+IXAertPi/Uqn
-NFkI8ewylphNXoewIEIjfFk6WSAwgc2scWgnj8U4un1LFjl//m4DWCEQEkjwuxNf1pTCQFDW7Gc3
-+lNgymwLJoieNYqSOhomsTRZTXyuRI4b/ttebvbNiALS
------END CERTIFICATE-----
-```
-
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
deleted file mode 100644
index 24052db8..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-proxy-service.idpdisco.idplist=\
- testIdp,\
- mobIdp,\
- ccBankid,\
- ccTelia
-proxy-service.idpdisco.langs=\
- se,\
- en,\
- fr
-proxy-service.idpdisco.entityid={\
- testIdp :'https://idp.svelegtest.se/idp',\
- mobIdp :'https://midp.svelegtest.se/idp',\
- ccBankid : 'https://eid.identityhub.se/demo/bankid/',\
- ccTelia : 'https://eid.identityhub.se/demo/teliabrowserplugin/'\
- }
-proxy-service.idpdisco.name={\
- testIdp :'Test ID-tjänst, Test IdP, Test IdP',\
- mobIdp :'Mobil Test IdP, Mobile Test IdP, Mobile Test IdP',\
- ccBankid : 'BankID, BankID, BankID',\
- ccTelia : 'Telia,Telia,Telia'\
- }
-proxy-service.idpdisco.logo={\
- testIdp :'https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png, 67, 68',\
- mobIdp :'https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png, 67, 68',\
- ccBankid : 'img/disco/bankid_logo.png, 94, 100',\
- ccTelia : 'img/disco/telia_min_logo.png,89,86'\
- }
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
deleted file mode 100644
index baab65d7..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#EntityID of the n
-natsp.entityId=${proxy-service.domain.prefix}/nat-ps-sp
-natsp.displayNames={\
- en:'Swedish Citizen Adapter',\
- sv:'Sveriges internationella legitimeringsnod'\
- }
-natsp.descriptions={\
- en:'Test service for the Swedish eIDAS Pilot New Local',\
- sv:'Testtjänst för Svenska eIDAS piloten'\
- }
-# 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'\
- }
-natsp.assertionConsumerServices={\
- 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\
- }
-natsp.nameIDFormats=\
- urn:oasis:names:tc:SAML:2.0:nameid-format:persistent,\
- urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-natsp.entityCategories=\
- http://id.elegnamnden.se/ec/1.0/loa3-pnr
-
-
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
deleted file mode 100644
index 546cd70d..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-psmd.gen.entityID=${proxy-service.domain.prefix}/ServiceMetadata
-psmd.ext.supportedEncAlgos=\
- http://www.w3.org/2009/xmlenc11#aes128-gcm,\
- http://www.w3.org/2009/xmlenc11#aes192-gcm,\
- http://www.w3.org/2009/xmlenc11#aes256-gcm
-psmd.ext.supportedSigAlgorithms=\
- http://www.w3.org/2001/04/xmldsig-more#rsa-sha512,\
- http://www.w3.org/2001/04/xmldsig-more#rsa-sha256,\
- http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256
-psmd.ext.supportedDigestAlgorithms=\
- http://www.w3.org/2001/04/xmldsig-more#sha384,\
- http://www.w3.org/2001/04/xmlenc#sha512,\
- http://www.w3.org/2001/04/xmlenc#sha256
-psmd.idp.nameIDFormats=\
- urn:oasis:names:tc:SAML:2.0:nameid-format:persistent,\
- urn:oasis:names:tc:SAML:2.0:nameid-format:transient,\
- urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
-psmd.idp.ssoList={'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/ColleagueRequest'}
-psmd.idp.supportedAttributes=\
- http://eidas.europa.eu/attributes/naturalperson/CurrentFamilyName,\
- http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName,\
- http://eidas.europa.eu/attributes/naturalperson/DateOfBirth,\
- http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier,\
- http://eidas.europa.eu/attributes/naturalperson/Gender
-psmd.idp.assuranceCertifications=http://eidas.europa.eu/LoA/substantial
\ No newline at end of file
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
deleted file mode 100644
index 666fba71..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSTCCAjECBgFc72gQnTANBgkqhkiG9w0BAQ0FADBoMScwJQYDVQQKEx5Td2VkaXNoIEUtSWRl
-bnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYTAlNFMTAwLgYDVQQDEydTd2VkaXNoIGVJREFTIG5v
-ZGUgdHJ1c3QgY29uZmlnIHNlcnZpY2UwHhcNMTcwNjI4MTQ1MzEzWhcNMjIwNjI4MTU1MzEzWjBo
-MScwJQYDVQQKEx5Td2VkaXNoIEUtSWRlbnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYTAlNFMTAw
-LgYDVQQDEydTd2VkaXNoIGVJREFTIG5vZGUgdHJ1c3QgY29uZmlnIHNlcnZpY2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR93BFw1lFLD3IUkYwKFj29R2h2kz8X1mKBoLKufXdTg7F
-HHgkJFUy6Kf+JTWiJoEC60WBTBj1Mf+phA0PS24PDBqErtnv5l1K8x1Bo930NqxMStwFbmaeah5a
-1ZeEMsWWGfJfMU26/yHux4ULkUqwxJQ9x5hYp5qLf/UaCbJvxOLyZ5wmHnups1+hT5AFe/ix6mua
-hKNCJplrZLpnMhFuSjZC+yDDH0F83X71kU0bsm8RKd9OW2t+g+XFRnVpf+mgHPf2bCGxDJpt5h/s
-ipQCP78gXsCL+6J7lS8pnxy/ZW2Qr4cwIvWucTlph0nAEHVv9j2K4pgCKR4hbD5MonFjAgMBAAEw
-DQYJKoZIhvcNAQENBQADggEBAFI5NDg0xPP8GGwItDSPYqF/PbN9k4Rc/ujXVxgNC/cZ3gSYS8Hl
-jcRs2bGx7uiOkJIWiaNXapMptyOgwbjhB4kKLkFnywIH9nV1yYdkf1ToBZJz/SuCAXSkVylTARKa
-memIj/9JL9L0FX7i+qyArJJO8Z7PhSUP1uhGEaPSLA3AuNT9xYzMUvrwf8+aDscvf0h0YjPjrIhn
-r3i8fvkDDSaRPbAe1xJjHZoOA2Y8socfw+8BsGoibaS00wVgjx9+gZWIE5/d6PBQesF3KMPUZZMp
-6WJrOnxk0z03V7R38PB/bTqivErVSYOZ3M8zIyqfPiWM2Fe35tHXXHN8XsQel6s=
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt b/eidas-proxy-common/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
deleted file mode 100644
index 3686046a..00000000
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICyzCCAbMCBgFEwQFDRDANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDDB5Td2VkaXNoIEUtaWRl
-bnRpZmljYXRpb24gYm9hcmQwHhcNMTQwMzE0MTIzMTI5WhcNMTkwMzE0MTQzMTI5WjApMScwJQYD
-VQQDDB5Td2VkaXNoIEUtaWRlbnRpZmljYXRpb24gYm9hcmQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCGxrPbCuZYeMZniwOAIO1MiQjGD3LIfaLBddNucsAVrxpYW7bYMwzvgL2Gp4yV
-6IyAx5kUgHPjEkEEIjH+NhxYdChD8iWBkLuaOkxyYNXFjFQ3APk5kqP+BB+fP8peWlKGX6S2mfcB
-7eObDQqb28osfXE+bak4X2rNf5i+Yx9VdXBpRhDxk7umDdWTSJlc+ZCxWUt3ldc58/sXIgAzVWk4
-9A3GIvOHlBVgm/5g3yzU9HnxD1fyOKT+NkF5J9mjM0x8Qg9K/Zep3n1xmb8kZ/vcRxv+AounGDd7
-w/QWW84sPegySHqm5GkLSgwB63nJZr5wS+qoT9sTooCM0AhBhY1FAgMBAAEwDQYJKoZIhvcNAQEF
-BQADggEBAESqy6GrAEbL/blJQxDb/LCCW4y3KAAs/pqvR4SQMP0rvVe5FJiUJsE/6DEhk+cl0N+o
-5e8/NusIUD7f6vKSYTHgCodSeDYGdrkRrOucDBWgIlYVsR3yTb/za3AlgiTW6eGGqiY6SeEzXNTM
-5o0GpoZbknQZEK/xCJLtMAU6oX7pDBLahtYeJAJJNFVjtPKsERr2Ob2ni9XW8+fxyjv0v2gmlQvW
-i6VnpD6VJ3nwAFDsGHBgzli32YBd62rukqyiqvC595LNg0Dg4fyv1ZuOiqajWSd3x8JI6bS01QvY
-3fNKY84wMQXpRq9C3zRtpPKmh22W6mcQvh1uN3qNaIEEklE=
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
index 546cd70d..dbab3852 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
@@ -22,4 +22,8 @@ psmd.idp.supportedAttributes=\
http://eidas.europa.eu/attributes/naturalperson/DateOfBirth,\
http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier,\
http://eidas.europa.eu/attributes/naturalperson/Gender
-psmd.idp.assuranceCertifications=http://eidas.europa.eu/LoA/substantial
\ No newline at end of file
+psmd.idp.assuranceCertifications=\
+ http://eidas.europa.eu/LoA/high,\
+ http://eidas.europa.eu/LoA/NotNotified/low,\
+ http://eidas.europa.eu/LoA/NotNotified/substantial,\
+ http://eidas.europa.eu/LoA/NotNotified/high