diff --git a/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf
index 89cafdd7..cf5e93cf 100644
--- a/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf
+++ b/eidas-qa-connector/overlay/etc/eidas-connector/eidas-connector.conf
@@ -60,10 +60,8 @@ export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem
 export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
 export TOMCAT_INTERNAL_PROXIES='"10\.\d{1,3}\.\d{1,3}\.\d{1,3}\|192\.168\.\d{1,3}\.\d{1,3}\|169\.254\.\d{1,3}\.\d{1,3}\|127\.\d{1,3}\.\d{1,3}\.\d{1,3}\|172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}\|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}\|172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}\|130\.242\.125\.\d{1,3}\|81\.236\.48\.\d{1,3}"'
 
-SECONDARY_FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities
-SECONDARY_FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
-FEDERATION_METADATA_URL=http://eid.svelegtest.se/metadata/feed
-FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata.crt
+FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities
+FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
 
 EIDAS_METADATA_SERVICE_LIST_URL=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
 EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
index a43bcb8a..59433048 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
@@ -82,10 +82,10 @@ 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.nationalMetadata.test.location=http://eid.svelegtest.se/metadata/mdx/role/idp.xml
-proxy-service.nationalMetadata.test.certFile=${proxy-service.path.prefix}/cfg/se-metadata-cert.crt
-proxy-service.nationalMetadata.test.cacheFile=${proxy-service.path.prefix}/cache/test-metadata.xml
-proxy-service.nationalMetadata.test.index=1
+#proxy-service.nationalMetadata.test.location=http://eid.svelegtest.se/metadata/mdx/role/idp.xml
+#proxy-service.nationalMetadata.test.certFile=${proxy-service.path.prefix}/cfg/se-metadata-cert.crt
+#proxy-service.nationalMetadata.test.cacheFile=${proxy-service.path.prefix}/cache/test-metadata.xml
+#proxy-service.nationalMetadata.test.index=1
 
 proxy-service.nationalMetadata.qa.location=https://qa.md.swedenconnect.se/role/idp.xml
 proxy-service.nationalMetadata.qa.certFile=${proxy-service.path.prefix}/cfg/metadata.crt
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
index 3ff17f43..bf1973cd 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
@@ -14,36 +14,3 @@ idp.testIdp.loapolicy=natToEidasNotifiedMapping
 idp.testIdp.consent=true
 idp.testIdp.deriveDob=false
 idp.testIdp.index=0
-
-idp.mobIdp.entityid=https://midp.svelegtest.se/idp
-idp.mobIdp.name.sv=Legacy Test ID Tjänst
-idp.mobIdp.name.en=Legacy Test IdP
-idp.mobIdp.logo.uri=${proxy-service.domain.prefix}/img/se-flag-rnd.svg
-idp.mobIdp.logo.height=67
-idp.mobIdp.logo.width=68
-idp.mobIdp.loapolicy=natToEidasNotifiedMapping
-idp.mobIdp.consent=false
-idp.mobIdp.deriveDob=true
-idp.mobIdp.index=1
-
-#idp.ccBankid.entityid=https://eid.identityhub.se/demo/bankid/
-#idp.ccBankid.name.sv=BankID
-#idp.ccBankid.name.en=BankID
-#idp.ccBankid.logo.uri=img/disco/bankid_logo.png
-#idp.ccBankid.logo.height=94
-#idp.ccBankid.logo.width=100
-#idp.ccBankid.loapolicy=natToEidasNotifiedMapping
-#idp.ccBankid.consent=true
-#idp.ccBankid.deriveDob=true
-#idp.ccBankid.index=2
-
-#idp.ccTelia.entityid=https://eid.identityhub.se/demo/teliabrowserplugin/
-#idp.ccTelia.name.sv=Telia
-#dp.ccTelia.name.en=Telia
-#idp.ccTelia.logo.uri=img/disco/telia_min_logo.png
-#idp.ccTelia.logo.height=89
-#idp.ccTelia.logo.width=86
-#idp.ccTelia.loapolicy=natToEidasNotifiedMapping
-#idp.ccTelia.consent=true
-#idp.ccTelia.deriveDob=true
-#idp.ccTelia.index=3