obsolete Ladok3 sites removed, Ladok3 sites updated with contactperson and mdui

61 files changed, 541 insertions, 4259 deletions

diff --git a/swamid-2.0/hsk.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/hsk.integrationstest.ladok.se-gui-sp.xml
deleted file mode 100644
index 6e15a87e..00000000
--- a/swamid-2.0/hsk.integrationstest.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hsk.integrationstest.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok hsk.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok hsk.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://hsk.integrationstest.ladok.se/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>hsk.integrationstest.ladok.se</ds:KeyName>
-        <ds:KeyName>https://hsk.integrationstest.ladok.se/gui-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hsk.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAIhhW9K62mFJMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWhzay5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE2MDYxNDEwNTMy
-NVoXDTI2MDYxMjEwNTMyNVowKDEmMCQGA1UEAxMdaHNrLmludGVncmF0aW9uc3Rl
-c3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNwEW1
-tlrO9Aa5vTMnljSk5ZWOlG0VYCpHUkvw1STjucL13nU+eKD8C7rYzbXsVji0iw3d
-Fkary1cLPK8tFli9u5cfnnsdqEB27Y+2loWla9qo8L/uPBuyK9Ht1fcNT0xtv3FY
-TDiXdHcF8xu32XfpPSMvrMq/sHmdBzzbVTVf+dHBOAC5RxuhMOjqU4GPs3VVwY22
-WAGjFrZHsSlsF/t+BaeGggb5f4kSWyP+6MuIE8il6FX7KsEbeJaMUXYK/sl3TvFN
-5Qq64Z7/HT/c3/83IqGEhQj5iK6FHuo2TabAzJS6vbUEe7OH6PPDTtPNvPtYCMzN
-lFarPnYRCOLl7KNtAgMBAAGjeTB3MFYGA1UdEQRPME2CHWhzay5pbnRlZ3JhdGlv
-bnN0ZXN0LmxhZG9rLnNlhixodHRwczovL2hzay5pbnRlZ3JhdGlvbnN0ZXN0Lmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUQXaWTVNhFyzkXRSEdRWUUbp8xEYwDQYJ
-KoZIhvcNAQEFBQADggEBACsBvuStf68CRjjqyXZeMNHICS1QCXAW7y5qpGwhEBDQ
-MVMv7r/hdZZKIilo+hrQ5/s9tcXUrm7ayJ8moXOkqstBFGZSi5IATiEQTuQgUPIH
-rM2HD1HvXxa9hHeXZaxEil//+gB9LYFbiCKDRc/OzndfMDgDLsEbOgchIFD605ti
-Phu403euhtD/KZzK6kjiWe1DrHUf6mhGlkvNXC/vaSSPgDrKDOSLYps6+lIbcQlx
-nKdl5XIjJemFgGpcOc2ZW0f4+PSmUAL6q651X9cNHvM+767/QMHfh4SDjZL9xdiJ
-jRXjwYKNYZz43SF1icrUFkZrhQII6+H2ivPEWUw4hTU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hsk.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml
deleted file mode 100644
index d44e652a..00000000
--- a/swamid-2.0/hsk.student.integrationstest.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hsk.student.integrationstest.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok hsk.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok hsk.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://hsk.student.integrationstest.ladok.se:446/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>hsk.student.integrationstest.ladok.se</ds:KeyName>
-        <ds:KeyName>https://hsk.integrationstest.ladok.se/gui-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=hsk.student.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIJAI2z0K0VXT3DMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-BAMTJWhzay5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwHhcNMTYw
-NjE0MDgwOTU4WhcNMjYwNjEyMDgwOTU4WjAwMS4wLAYDVQQDEyVoc2suc3R1ZGVu
-dC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAsmeY6Dhg+r0LBJXtJ1Q2zvRQQvKDjxCcq0lrKuwCRoX6lRmB
-Acb7tLhAh4R3ABxAK1A++EW5Fro9+BPwHYoqSmQPHzs62XTpSKWhtsdOvTvt02qp
-N3ezHMTWi7ieKPSO8Rwvx1IU6RcpI1xOIydpkyRNrWcuvcYu9XEBzMI/VviVc/Cc
-kHHFEsz/3BCcSgEVK6+72hnyzTQmgxXZYuUPyaHID36AmHmaj8ToUxQngvIHISlz
-L+N5u2hVWZelCk64a1Jj50MdDRZ+sMg57UJhDEIarZxK6fFmLFIrq51J40EdeiiD
-RIazf4QqQKq6snno3nBeIAOdAUIJgL2QqtRiJQIDAQABo4GBMH8wXgYDVR0RBFcw
-VYIlaHNrLnN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZYYsaHR0cHM6
-Ly9oc2suaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYE
-FGItX/ug1OlgMS6TqqpzsVCsAr2WMA0GCSqGSIb3DQEBBQUAA4IBAQB5Uw5g3/1a
-BXXto0UjkJpBF4gIBwAPfbeWTEcgmy0YJcFZFzMyRFuooyxCsR0w5vd0nkE+p2hp
-xYwskuSZ3Proh+4V09b+Co4vhD2KdoRGYuXFEIvwi1FMMrgXlB6IsAAtL5zZCZOv
-Ew4hvfj7+tIS0L/SCyLrLDvx17zEsT6TW/6vSR2jEUZdE23Gyj9ppO65bpqP1+XI
-xq7s52AC2fSEfMPcC2i2CxM+pBg7PIoyG30T61xTYjdfba+Pv1H2yCcO2foRh7o7
-MCuAPiSOKSeoQ7QZFxvT2xoIlMs2UooH06gdsRK6+oKWCaOVUpPcry7XNXl0pJvg
-RKmJ1UnF1rDO
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hsk.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kmh.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/kmh.integrationstest.ladok.se-gui-sp.xml
deleted file mode 100644
index 3028b3d2..00000000
--- a/swamid-2.0/kmh.integrationstest.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kmh.integrationstest.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok kmh.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok kmh.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://kmh.integrationstest.ladok.se/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://kmh.integrationstest.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>kmh.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kmh.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJALHX1eozTDxQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWttaC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE2MDYyNzE1MTI1
-NVoXDTI2MDYyNTE1MTI1NVowKDEmMCQGA1UEAxMda21oLmludGVncmF0aW9uc3Rl
-c3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkcQj0
-x6WQACzUByQurGoFX58Hv4gVjj9Q7bdEJmInWeJ+3OacNkOGXAfNYdWS0xxadU70
-KpHoQQgVzT1+NwPvVr7k+SmgFnlyJtHzXbxYZvfQo94tF2bYQ3iSCuigjA2Av3gT
-Psz91rU/ycD7zM5h1KlU3WPQnlN0Wg7NVFGSKgtDSIjybghPvb02gSJBd0ymyDz1
-NzRaJ0F3gBf8ghhmjqwrhsOGuGZ+y4b8Bz8ar4lEbpJ7EZu6VPGj0JIutWzHaYuJ
-A0kbN5YeT/ZYdO1ykiM633duLyf1apmQjU02puahiEtKPEHBojjAOD2A1mQ9pWR9
-Mu7iekYmxfjcSPEbAgMBAAGjeTB3MFYGA1UdEQRPME2CHWttaC5pbnRlZ3JhdGlv
-bnN0ZXN0LmxhZG9rLnNlhixodHRwczovL2ttaC5pbnRlZ3JhdGlvbnN0ZXN0Lmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUiruzdFXDlea6MiD0bVC1qgyPMocwDQYJ
-KoZIhvcNAQEFBQADggEBAALPIQOxy2ygArAtnyyCFDw3lsu8WJNgtM55nCm2MQDg
-sI4WM38TtkP8YCb7lkvyrV3GUpQa/F+w2J0lWBPsRIuJkqhUH2d9y1cGAUJ7R0Kb
-3zQ/ECvS8dFJ4ji7daYXZWmFffDRiX0zPY4S2+O0rqzr3+ZVGgFSwrfkhyfTx3IZ
-HLrXG7NGDhjgTwtZ08gPgoInE2aLLqxU/is6NYpdj9tj/ORRGRP4S8AT0vAvELI/
-qzmm/Bf8tMVEAGcnE2Y5GItIxCVqaX99hRXbeII007RkeA52C/DmE3puezmbaYUl
-H/N6QIuWM1ji6gl/yhzb20c5M3TkFx7lbIY6MpjMDro=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kmh.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/kmh.student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/kmh.student.integrationstest.ladok.se-student-sp.xml
deleted file mode 100644
index 2e3c1b6e..00000000
--- a/swamid-2.0/kmh.student.integrationstest.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kmh.student.integrationstest.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok kmh.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok kmh.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://kmh.student.integrationstest.ladok.se:446/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://kmh.student.integrationstest.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>kmh.student.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kmh.student.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDcjCCAlqgAwIBAgIJAMd9tTlqX31UMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-BAMTJWttaC5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwHhcNMTYw
-NjI3MTUxMzAzWhcNMjYwNjI1MTUxMzAzWjAwMS4wLAYDVQQDEyVrbWguc3R1ZGVu
-dC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAqtWs3/H8/K1Unq1PC0+sYCGaxwXWw4+YtohfJevg+HmFl3Yu
-mp60ov/EOXyKPb1Vf8XHoJx5JCG9gw0uiHSMBq95eQSceEt2wElJBXDR+MW2Z/Db
-hsE+RPudQoJKKkPrzD2Lbf+93y/kl9Nt6rxJBp8nksMGFkP8V3V5PECxP0P0B+9O
-JT6rJJ2eeqJapWOUc6Aci5++YWaLrtA5t5XxRMVIt4Id8lpiW5xsfVc/JS5lencE
-gm5P225xPM22QsnGBVLe4WuTBZCeBdruRauDFP1qgz5zz3EBpe0wjR7oD5shPuWN
-iVxPrEUbenPOsgPi2mBpsHnlAtKMmNWx6Wx/6QIDAQABo4GOMIGLMGoGA1UdEQRj
-MGGCJWttaC5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2WGOGh0dHBz
-Oi8va21oLnN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZS9zdHVkZW50
-LXNwMB0GA1UdDgQWBBR59jhtFFh7OKdou+QmWOadn5Y1ejANBgkqhkiG9w0BAQUF
-AAOCAQEAKGos2ShRHCWOeJhhFqFyKWPAKBRbKestsbVe4QGTe4NGFr68DOvKTyzL
-/uEfGGE9giS4I38hDd6f4M3j2VVcWQHewMMTbAx53OquaaPt5mv42MGjv235wyCL
-P0vRKGJqV7wNzLJeARp0xsS/WmJBRbKK1wJ40rvwfzarZbxhdZGfYcdtAY3OzxqV
-gfs9pyZUtrxnqDqtzptwIvs57SufBH/EFPBH0CXCD/fl5k2oBGs8myJNu9tRPLno
-SCOpHeG6/GC4GQTE+mbM+AKOHuO6n7sI7bJwd7O5dud7vZB60HwNs+ZD9CzvQBCV
-mUyf2ht8Z26b4fx7DGHuR64kse0yhw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kmh.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mah.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/mah.integrationstest.ladok.se-gui-sp.xml
deleted file mode 100644
index f2c2f941..00000000
--- a/swamid-2.0/mah.integrationstest.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mah.integrationstest.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok mah.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok mah.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://mah.integrationstest.ladok.se/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://mah.integrationstest.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>mah.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mah.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAIbKeTSM14n0MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHW1haC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMB4XDTE2MDYyNzE0MTc1
-OFoXDTI2MDYyNTE0MTc1OFowKDEmMCQGA1UEAxMdbWFoLmludGVncmF0aW9uc3Rl
-c3QubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBlrnK
-lbNOzttJCTO5kMAU1s5vPs5JDHHyXUJuxUlsWOw+Oktse6ihY6znce1TEzXmrQuD
-JuLXXVTqhf4SHXFflECghz69B1rHhA4aRpI9SxgpUFQhL0aldNINOviT6a+bp/Tz
-7sBX3dt8dYziXF7wC5Ajk569553h7AxaMrhZ5kgt1gsSk4EY19BLYWzjT/Jf46BS
-XQuq41lULOC5Nb5Ml5U7L/s8ZbWSw0iLzltZWZzouP8f/Or4d11oZbyNRQoQbiJe
-Sewm3oAmYVOBykhI9m065l0/gzNMKLpTvtQvPuPLIVoLBgIC2D2w8TRqiMdEDSaL
-Yg2A8ORwuKY1hrtPAgMBAAGjeTB3MFYGA1UdEQRPME2CHW1haC5pbnRlZ3JhdGlv
-bnN0ZXN0LmxhZG9rLnNlhixodHRwczovL21haC5pbnRlZ3JhdGlvbnN0ZXN0Lmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQU/KrR9eXAy+RFc9uiMUgO5dZCqEIwDQYJ
-KoZIhvcNAQEFBQADggEBABPaNqp9tiH1wurNY7QN+e0nJ7DWtRdS+Cd2gyYvsHwz
-ReM0o/MOzK9syTGk0NKXC8z71AHD56RCTQaM1XH6fIcUeLHh7Vorx33SRtNcJHM6
-WU8/zxv/m/WGhsDn1SZbrbab5qoD1HfBCCivjoWIMfTlwwoq4yRMjFaswO9nPFON
-bLXtTkmgxNqnZ+QL9Px58L0k4LYJCI+Df3t5TIMEMJb3SKmQVKsmVTKutPmqvrrt
-/iE3th7D9c+vVIbIadvaffKNSzEczXSSErKeuA+u4sgefoMEzw1l22JKmHBWoEvw
-VJSaIOofgF1YIzdsxKM1bE8lMAyCEsYcObOpGfzma7k=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mah.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/mah.student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/mah.student.integrationstest.ladok.se-student-sp.xml
deleted file mode 100644
index 17e8289b..00000000
--- a/swamid-2.0/mah.student.integrationstest.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mah.student.integrationstest.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok mah.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok mah.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://mah.student.integrationstest.ladok.se:446/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://mah.student.integrationstest.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>mah.student.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mah.student.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDcjCCAlqgAwIBAgIJAPKV4KyI2N+7MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-BAMTJW1haC5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwHhcNMTYw
-NjI3MTQxODA2WhcNMjYwNjI1MTQxODA2WjAwMS4wLAYDVQQDEyVtYWguc3R1ZGVu
-dC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAuY5/zA2yQlztoxV+EkyIl6pbbl4vYrEeTrW+tY/xFbB/YYCU
-wWb/Xvz78ttHAwZfnH8LJ5xkhaau4KZxXC+Od7QDaj9lvO9c4f/QFNXONoEHHYRO
-+o6RF57SQM44qW4pPe6N4tjWPyIVUdtbTre4a6Dz1BQ9mtyrxQ2lJav48E0YLolj
-Auj6v3Fi4rkVXDpwSAJgC4H8ZOg9r9ZyT/Giv6E8Hb/YIIRXFzPtkcNVx3PJyEvG
-1flFdXD7rrdBT4Yg6myz/IkNk4md6M2OCjFXh8BUboUyn2BfAMozEvi+eMPCbazJ
-RFHm0eBpJ51W8l0gghJLHNx+5SoJhwaI4czgqQIDAQABo4GOMIGLMGoGA1UdEQRj
-MGGCJW1haC5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2WGOGh0dHBz
-Oi8vbWFoLnN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZS9zdHVkZW50
-LXNwMB0GA1UdDgQWBBQpOnth+NBTXONmX5NV57dmqYV6TTANBgkqhkiG9w0BAQUF
-AAOCAQEAoJzeEJkjlXZ60XB/gRTa+465SvesfXVrC1echQJXZogMunMBontZzreN
-yURRMu3Nys5NeZnbC3Uxsk9BRUVF59Sd1oXdSQvYgJVxdi3THTskmATq9sfAoC7K
-gJOdmCWDI8G09cvAvYTe5o5ivOzCh5+oLvhpVMhh9FdnWbRJOFt/0ebcxgUN2GAj
-xbw+Gnpjuk2FRtJxa0+qznaxTRaw1mI3hFmtKycCNk8etkplx0xtsEZZ4zveYv58
-Ba+yylfGOnbnaBRc6Ktr9ajtXvB/LugKpVY/EQJpAVQbLELmNJociaJ5PMML8SK+
-NaGCkqdJpewca/Vp6qB7FqZW/b92iQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mah.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml
deleted file mode 100644
index 347553ac..00000000
--- a/swamid-2.0/student.ate.grayzone.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.ate.grayzone.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.ate.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.ate.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.ate.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.ate.grayzone.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.ate.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.ate.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDWzCCAkOgAwIBAgIJAORuSk6Eq23DMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQuYXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDQyNzEyNDYy
-NloXDTI2MDQyNTEyNDYyNlowKDEmMCQGA1UEAxMdc3R1ZGVudC5hdGUuZ3JheXpv
-bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj+yBp
-XsiSe6jC2u+BctNk+VZTAsjnP6xPzoal/D35zX9SI5f9U+NObVjzsyPg3rJ+FOaj
-xLIr+gfuF9yOb8TMAjwDP119OIBBTW0zg+Qwh6LCbumP3TrtxqzcpBWIrAfpB2lf
-ZsNqO9AAjFLvw502G/NHYAFVIfIG4+4+U8ZvG8Vf24LrWRv6QNasYAUVAtnyXMX0
-MQ7j3DR5APlMlX8v/v2/hM7sulQYWG/B3dJtraOnJS0ChOi+qTIrel9qPkubSyAE
-JG5fu61RPQCqKZ8zrc03Pb0UwsHI+fuH1rqXW79JweIYlIaQZnDnX7VyH1fY13rA
-ym3GLSX6zETGzvk7AgMBAAGjgYcwgYQwYwYDVR0RBFwwWoIdc3R1ZGVudC5hdGUu
-Z3JheXpvbmUubGFkb2suc2WGOWh0dHBzOi8vc3R1ZGVudC5hdGUuZ3JheXpvbmUu
-bGFkb2suc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUcGYd638GO6By
-zxxRpJGgVd9/vS4wDQYJKoZIhvcNAQELBQADggEBADJsf5USxqSPcLxW8sXYRFmA
-y6clwJouncFvwm68R9vyRGVgVcj3CiZdLWwfCeEOgdQlosuNCH2iWxsqfOS8cXr3
-6qxY2fV6mPBKKZ5g1sjFOFY7c9jGmxk2wsWOwH8hKwpKp7jCH4wKC4UV5jeE6gxx
-nsJx+NtDQJf52Apw+StEyXWRdkXdsJqSJxi0ceeYsD5i+WQ4pl3asaHYbezokfv7
-I19MAsA3MUnDVe/RlhjZ4xc6qnWlR5CjDkLhx5YGUSWVflnD+e8jeKmC58ya1PBM
-mp4NftTztxnmXF+uwS5Yvi3egqAlAoGb1xO4omwJ3qlVbWdDXY4SwnMcGebOeac=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ate.ladok.se-student-sp.xml b/swamid-2.0/student.ate.ladok.se-student-sp.xml
deleted file mode 100644
index c729427f..00000000
--- a/swamid-2.0/student.ate.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.ate.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.ate.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.ate.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.ate.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.ate.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.ate.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.ate.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.ate.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.ate.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAPGA6tzcgNkTMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHN0dWRlbnQuYXRlLmxhZG9rLnNlMB4XDTE2MDMxNDEzMDMyN1oXDTI2MDMx
-MjEzMDMyN1owHzEdMBsGA1UEAxMUc3R1ZGVudC5hdGUubGFkb2suc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKyIfQtdq2FrR8qsthGDMXmaFHZ/Ge
-bpjOO6YMeNpIP3U8QceGuMWWLkgweeci78hkFZ/zni1WNF5V0zhMTLGrRs+ASHpM
-+BqYM5Xf6OIyKTuUOMhaJnQY55HPNy5SWB3pZLi/8WP7QWL6wkZSOJTtwvjHz8vu
-Wy+0qVx//LSul6BFIEOMMfc6NJGg3KT91n8Fs3kxZcawiyuJiO7O9pCdbOG0RXW3
-ipIOZzv/YjC7Cb0e3kea1ED37TO4I8AxwVKpkhqNlZoRONY439NGqG21e+Oqrogs
-hFy7g35Irf4c/EizrTah+bZtlPzxi11GN7AeBzDucj4IfnPg4WEfqOydAgMBAAGj
-ZzBlMEQGA1UdEQQ9MDuCFHN0dWRlbnQuYXRlLmxhZG9rLnNlhiNodHRwczovL3N0
-dWRlbnQuYXRlLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUCS6vUkUfFHEL0Vjp
-2qWovVeYakwwDQYJKoZIhvcNAQELBQADggEBAFeXHEuJgAFOa9Iq1WhDXzmcv6BG
-pQYZLrHS9LCXL1fhVK/9yr3T0/vB3yyovt+poihL+LOTauVvpR64GQOYbwoQmoMr
-8XySdGBhTol5B/jnBRiRuWMOMtJ5P+Bs/BqGb2tpyFjgujIJoH67k2C7mIbqef+4
-1livYsr6oZqYqCM7p7I1e7ZrD23Izt9t/xfRB1rWwqrhyDSJIOSdkJihcv9tty71
-kGZl4+dk2BsiU3oulvfww5KhVbMYttnmm+4N4Gh4Sc8/xNM2TEuLZY+1AsZGh5RW
-KrMJx6CX82Vpnibn2PQZsp52iXVQN/95m3Cx3Oq2Cj+cYpfNQHPcSdSET5s=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ate.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.cvt.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.cvt.grayzone.ladok.se-student-sp.xml
deleted file mode 100644
index 6f193f1b..00000000
--- a/swamid-2.0/student.cvt.grayzone.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.cvt.grayzone.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.cvt.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.cvt.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.cvt.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.cvt.grayzone.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.cvt.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.cvt.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAOpgFVuQUtH6MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQuY3Z0LmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMyMzA4Mzgw
-MVoXDTI2MDMyMTA4MzgwMVowKDEmMCQGA1UEAxMdc3R1ZGVudC5jdnQuZ3JheXpv
-bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH+h1/
-Brzmj+s08QwYM4l5O0818VgVL2c/V9BT4vEtB0KBcHg6ZJ6BDTNbW23MlEi3lhIx
-/x37n8itZoaN5oXpr1skEPhtEE7aeCclMhPE/o7N1VaFC0XJODqQ8Je6Z1lrCC9y
-CGW8/UaG4vNm5dMe2fJRUnsUi2eXvNUHW38lY6Qy5h7fu1v0/3xOc4bmz15gno7L
-LV6XgHTrlQ0AUqksZXwjjWROT+gg2XY/iW4agpd2ToTmA8w/4a3i9c+AD9XDXIiP
-l8dAE9eoGi3oFcw6xMZcDgEnZ2SRXdl47Xv3v1KnHaebcpdh4GntjQ3KfQwZ0K3V
-eBkHZKkC66Tplq5bAgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuY3Z0Lmdy
-YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuY3Z0LmdyYXl6b25lLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUJ6BsYHxsMlx/dFr2rU1C8IF6zpUwDQYJ
-KoZIhvcNAQELBQADggEBADUU/h/13o5Rx3dQ20A/QePdoDYOSGSg7uuIvu+clP/q
-Yofp52zdyBy8xvDXJHjSuxLQUCSBMDGcUpiQBLdgT5AMoO634HXMbNx9Wg/u80Q4
-wJVVNLthWkr6yoW4f3uMYPlvKv6uxZDsjpFVcDmrJEG/isTcM2hKnLIRkqhfz0R0
-hM4d4hmp66jbA+rR4quZc06JDk9GQtfHKpd0e/E2m1icZ0iXNQoR3nWhy43w8/1F
-Q6FEQILyrefMbTyzMrZLAwVrrdUj4CGKUT5trlYz+7oxmfIdevj3BoxeJJCbUIRS
-Eaa85NvpzKUAXe6s3r7I7NqyPBiZqlys09ihK5QDjG8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.cvt.ladok.se-student-sp.xml b/swamid-2.0/student.cvt.ladok.se-student-sp.xml
deleted file mode 100644
index 20d1551b..00000000
--- a/swamid-2.0/student.cvt.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.cvt.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.cvt.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.cvt.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.cvt.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.cvt.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.cvt.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.cvt.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.cvt.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.cvt.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAMQUFu9hRBbAMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHN0dWRlbnQuY3Z0LmxhZG9rLnNlMB4XDTE2MDMxNDEyNTA1NloXDTI2MDMx
-MjEyNTA1NlowHzEdMBsGA1UEAxMUc3R1ZGVudC5jdnQubGFkb2suc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCww6s8AXukNEe9sqmdKPAhqGagAiil
-9X0OLI11+zM/ZNDqgPVp/PkazpsyhTjZ75KZd7PycPDg0QSvA0c5mfJ3LzjXSo6H
-1wgK8s4Co9qw9+iuYe0+IIo0AzyywROmyocwe4Ogcmgyhfkk0GlH4sUrubsEYGF5
-zjXoIPqQeSGX0iRu6OLatytrYW5G+2sfDiLvjIx6WyCRofqxGpw0UFnqzshgCqf+
-MF5yhUYb9bL3Z+n0g438pAJWB8SHMo7SF5E8Io3jBEt+TFZcKX8Btue3MSFKWE3V
-OggyHqC/YJDrKwMbplpf33149Xya7qsVHGfGn1vHGEV9qHcDAfzb2iHJAgMBAAGj
-ZzBlMEQGA1UdEQQ9MDuCFHN0dWRlbnQuY3Z0LmxhZG9rLnNlhiNodHRwczovL3N0
-dWRlbnQuY3Z0LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUzNibcuI91UxXPtL7
-if8DRHxDVVowDQYJKoZIhvcNAQELBQADggEBAJbKjPVaGpzIPzy3qSPibIFE9kQK
-8+6gdhfvOT7uDKMXFJl5wHYhdlJdQwGDVLZ0ypKDDhKy604de4CaxcguBx1SyAMm
-tCmca7YcLOZsWzzXs56hkl1wGsbCaBWQ+B5I+ekF7rQo8jr2ET5p8hlTjjdLf01S
-GYTN1IiSlcwmRQfd6DXrO+2BOrsBf7jytPeoyy4A3YEfsP/jwtdbyAEjm2Nn6gkZ
-XKD0jhIk+fkRgCXvqtT4sIusZaziRdmhXKI/WAL/r5XL3SsE7knFtBTU0U+02grq
-sT5JHJ3U9r/brdGPiSt7y0rUeDe3+ChZjBUlfQ4z/NlOdMwX93/2zTk+qYc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.cvt.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml
deleted file mode 100644
index 0aaefabf..00000000
--- a/swamid-2.0/student.ete.grayzone.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.ete.grayzone.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.ete.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.ete.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.ete.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.ete.grayzone.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.ete.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.ete.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAM9TZ3bJgRSnMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQuZXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDEyMTky
-MloXDTI2MDMxMjEyMTkyMlowKDEmMCQGA1UEAxMdc3R1ZGVudC5ldGUuZ3JheXpv
-bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrGglc
-qjEsQ/2l3R85R++FVQCh14u1PViCWv/0JnTzwY/St1ZlLlLGE7m6OmEBUus4CL2N
-/HYJ0CUzUQCIHZyOlr9aPFd7QESvCqN2jY1VLzJZib4snNU4E4mMwD4G3gPJFLZN
-9VUQ/tLe1/rarpWJT8+YJsriMooH9s1MnmCwq+qTZ1UWNcqy5HGl9SfgfLXGNlLx
-fMrU0qT1cbw6QqMvb8piqa5Nh+UbkYnTkVkkvw0qt0gg11zmW8h4m9UJ+16FzdBh
-VMxDEf3GYiOYF+/vNqcBYUM6bbUQZC8vDawHzi8QLWUyNSoC697M1CXUZxN2napX
-7eWDHFRO5S2Mdwz1AgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQuZXRlLmdy
-YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQuZXRlLmdyYXl6b25lLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUGTot6nFf4oASiKcWzhx14GAXxGcwDQYJ
-KoZIhvcNAQELBQADggEBAElk+35EkGf0cnnmvvWX4fSURP951DAhBMIZUvjRUbr6
-yFB87ks7qRZtWVnU21DY8TPexjW+z1FXxbjaK291IHf1Q3PsTtJxM7TYxuhQfTZC
-yS5mTLvbctumSGkBdoCcoYjt32hc0Z55uid7Q3fTuYAyM5aWXwaKLc6xtnhj/SVs
-XynDfWLB38dE1w3y+l1M1jA54oThxbY6jQ1xtsH//uaVs/N/KH56Tl9a7GbPkqOu
-BIAoHEP3VaBC4B2DHmv9NTi8Rig3yWn6fI455tJeOE1k9gJoipjnuIIfqnTyjS7S
-jiq6Ou5FTOEqQgLPeRmGW7g6EvnhUSXTSawYV46aXc8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ete.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.grayzone.ladok.se-student-sp.xml
deleted file mode 100644
index b9b364c7..00000000
--- a/swamid-2.0/student.grayzone.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.grayzone.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.grayzone.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAIGkX/wOfnFpMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGXN0dWRlbnQuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTE0NjUyWhcN
-MjYwMzEyMTE0NjUyWjAkMSIwIAYDVQQDExlzdHVkZW50LmdyYXl6b25lLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7EZ6ip4ed9S31sHM
-kn3u3Jt7CzPEhlhY6pIG3N/hIkeUeZns49ga3WCxr7mSsYmMLOkK/WmOmgRr6X7I
-r4zwwGaFxHuyBifOEn8pbBF9+NZU2odYAqjXCwTTgI7Dv7oOEnI83Qvpwsfvu/B/
-Z9cvgpWWmK9IWDlgdrJstC9m3y4LkeTpbWfRnJfvl8nSl9woDoUE0sc9BqKGXJIF
-EUepi55j51lHA66q1HU5G2rcDWXtC1zZ0b7qmsIRD16TMqODgwsOAdZF33LHxp2b
-lLONXk001RzjUi3b4CNVm+PNXzCwibQSwmxJNQdtBPk0acFnSgRZX2c0hBSwvAg+
-qJooXwIDAQABo3EwbzBOBgNVHREERzBFghlzdHVkZW50LmdyYXl6b25lLmxhZG9r
-LnNlhihodHRwczovL3N0dWRlbnQuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBSI2f1Krb20gR6VnpnH61B1vycoBTANBgkqhkiG9w0BAQsFAAOCAQEA
-K/pOvQFHi38hPYPWCZwOxfTGVye9orF5FSajYCyucrQLZhoDdj4e4gll/p33dHd8
-MevGPBcHvab4OetEonqLyTnauaGcummYfbu71SN+3cuyKuMuLuS6r6zjg4urKLTB
-+T/ludsssL8Kh9JcZ9KNrCh6slW64WrvCs2/oZRBq6AK8S+1JxJWq25ooboaVxu+
-iL8W9vWi42ftSllQFlfaco3PwqFLyaLhI1Yf4BDQEPwVmliCRiLAOVMsF9Edfxr4
-3f0CFDF8FL3zPA2piWosG7hrENU5gNTWU4NW5J9PL9ElZNvcovBC2CMuz9W5Cciu
-SDtqcg4gkoVpkscIiQGWrw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml b/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml
index 23eb5037..ff7d4e00 100644
--- a/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit-ik.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.mit-ik.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -34,8 +30,14 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT IK Studentgränsnitt</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.mit-ik.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.mit-ik.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.mit-ik.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.mit-ik.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,25 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.mit-ik.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.mit-ik.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAKoOk/IYnkUHMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlMB4XDTE1MDIxMTE1MDUzNFoXDTI1
-MDIwODE1MDUzNFowIjEgMB4GA1UEAxMXc3R1ZGVudC5taXQtaWsubGFkb2suc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFjdHFypvK6B6Rir74wGCP
-Ihe6Q2cPg4LFX6MllAToyZ8hTCWjgkWfuIQb0Y19feu0+OtVkX1PNGHI++xZ2jRe
-WXjtbVVvYLZJXZ0pHc5BWKTVBO/ceUHaPpxqHvBG5H/45hD+nBlgNugOEYHuONt3
-kk44ykHEmkOFfXFK2evKDvU0hQQoIvcJLqCnF4YoY+uoW6B0kR85V9S26dI/OYf4
-pQ97FBLjTpdp1mrxl3FzvhreYdp87pMX/Mt8glnlPcC75QISofzhdbCwKt4/K6kp
-Qsh3SogfG0utTmTrMRrX70A4FUT8tINWMW7lYzv3EmQG4NzYqblzEFGW081NNc+d
-AgMBAAGjejB4MFcGA1UdEQRQME6CF3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlhjNo
-dHRwczovL3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFAIPsERizWQ0mxP5l/tZoFmLFdJaMA0GCSqGSIb3DQEBBQUA
-A4IBAQCtIQI5dumWKvG+8JMOl7FHUShqrqLUNZQrOIOaR3vUUpt+e83aHZvxHVjW
-Hdk2KxQXPqzhLZSn6HdPwCvVKjAtEOVnQyDIi46XAgcd5jPxphqO596DQuNvTpOw
-t0HqFe6ZMyNyx/sXNoUioUfDOuNJpOeBq8qcYzE8TILDyXzkdcmnQxzJla9jcCn1
-BTZkB4p0AKYSK6Bj/8Ei2Ts1Qsc91jKuL8IBwtCzwBX/ylIwXZ3gsEHPml4aoQ9K
-nPk29bFsyJEWcfYMu3UnTMPSxCIkr+nyaydY1WWJXWhmbBQ5Sf2AfGrHaA3Lau4W
-FC/69gmQ454invqHaiq/uMW2hYdh
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAKoOk/IYnkUHMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMTF3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlMB4XDTE1MDIxMTE1MDUzNFoXDTI1MDIwODE1MDUzNFowIjEgMB4GA1UEAxMXc3R1ZGVudC5taXQtaWsubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFjdHFypvK6B6Rir74wGCPIhe6Q2cPg4LFX6MllAToyZ8hTCWjgkWfuIQb0Y19feu0+OtVkX1PNGHI++xZ2jReWXjtbVVvYLZJXZ0pHc5BWKTVBO/ceUHaPpxqHvBG5H/45hD+nBlgNugOEYHuONt3kk44ykHEmkOFfXFK2evKDvU0hQQoIvcJLqCnF4YoY+uoW6B0kR85V9S26dI/OYf4pQ97FBLjTpdp1mrxl3FzvhreYdp87pMX/Mt8glnlPcC75QISofzhdbCwKt4/K6kpQsh3SogfG0utTmTrMRrX70A4FUT8tINWMW7lYzv3EmQG4NzYqblzEFGW081NNc+dAgMBAAGjejB4MFcGA1UdEQRQME6CF3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlhjNodHRwczovL3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFAIPsERizWQ0mxP5l/tZoFmLFdJaMA0GCSqGSIb3DQEBBQUAA4IBAQCtIQI5dumWKvG+8JMOl7FHUShqrqLUNZQrOIOaR3vUUpt+e83aHZvxHVjWHdk2KxQXPqzhLZSn6HdPwCvVKjAtEOVnQyDIi46XAgcd5jPxphqO596DQuNvTpOwt0HqFe6ZMyNyx/sXNoUioUfDOuNJpOeBq8qcYzE8TILDyXzkdcmnQxzJla9jcCn1BTZkB4p0AKYSK6Bj/8Ei2Ts1Qsc91jKuL8IBwtCzwBX/ylIwXZ3gsEHPml4aoQ9KnPk29bFsyJEWcfYMu3UnTMPSxCIkr+nyaydY1WWJXWhmbBQ5Sf2AfGrHaA3Lau4WFC/69gmQ454invqHaiq/uMW2hYdh</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,4 +74,22 @@ FC/69gmQ454invqHaiq/uMW2hYdh
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml b/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
index ce2ef0c9..46abbc12 100644
--- a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.mit-integration.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -31,16 +27,18 @@ and do *NOT* provide it in real time to your partners.
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.mit-integration.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.mit-integration.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.mit-integration.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.mit-integration.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.mit-integration.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -48,26 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.mit-integration.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.mit-integration.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDXjCCAkagAwIBAgIJAPfDdOaBXPJlMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-BAMTIHN0dWRlbnQubWl0LWludGVncmF0aW9uLmxhZG9rLnNlMB4XDTE2MTAxMTE3
-NTAzOFoXDTI2MTAwOTE3NTAzOFowKzEpMCcGA1UEAxMgc3R1ZGVudC5taXQtaW50
-ZWdyYXRpb24ubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCYuvmukfJb/jSe6SzFeoXEFRIMQd1HG1P6kHefPKTjFbEtj6xXPACFoAnvBmnN
-VtexOrOHMDMJvj6MhsNg5M6NTqRbsy5G1BdOT7i57/BwQ3MmPM0Um1sQqzN2hV+J
-wfLLwIxpwJmHqkXknSxhpyaYlIIJ/Unum4sD8+MX3i2yRAE1HeazypCvy4Z3weuk
-WLdl+PmLbiS0NCF6ykuZPEFFISiB08aVYLbTk11eVT5pN5mOkpv5O+PvUrxonxK9
-qARgMwqVMn9W+ICOb6cYW+U1jy2InS45CxruWvA6v313TZDEptl8KhOEe/Au6Cc8
-lHsuznfwFl4nDD3o8rg1Zi9zAgMBAAGjgYQwgYEwYAYDVR0RBFkwV4Igc3R1ZGVu
-dC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2WGM2h0dHBzOi8vc3R1ZGVudC5taXQt
-aW50ZWdyYXRpb24ubGFkb2suc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQUalAJNcSp
-ImmbNzkxXNzaLzaVhIwwDQYJKoZIhvcNAQEFBQADggEBAHq6UWwy5nK9qotqN0al
-Nm/FDriwj8fzJyEyOzN5WX/adTB/SdDvJ9JiQc92cGTKl2hiJj68pD3hduoV//ET
-BreMiIbCAHcVT6x9mcbSCCASJsV9VgMJjsltaZlNSAwIlJrjwM1k94EoFhl+vdVr
-9zMOSYT46J0LOFEEf33yj5as4fz3vMydZTIeL1uYqBAi5EKzusY/EZJFtcJ5QRbM
-61d5VQ1kIsVxaltskEgPp3ao0p2+Ei8/Lqz4XGBeNZGynxYp6gcbs0+kGO80GrZk
-jkECDUoPuLLowdMRn/PQwPQ8UH02HIziYUqhQNHqGyDHulOnfa6ZzlsL7S8ieixW
-Wes=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDXjCCAkagAwIBAgIJAPfDdOaBXPJlMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNVBAMTIHN0dWRlbnQubWl0LWludGVncmF0aW9uLmxhZG9rLnNlMB4XDTE2MTAxMTE3NTAzOFoXDTI2MTAwOTE3NTAzOFowKzEpMCcGA1UEAxMgc3R1ZGVudC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYuvmukfJb/jSe6SzFeoXEFRIMQd1HG1P6kHefPKTjFbEtj6xXPACFoAnvBmnNVtexOrOHMDMJvj6MhsNg5M6NTqRbsy5G1BdOT7i57/BwQ3MmPM0Um1sQqzN2hV+JwfLLwIxpwJmHqkXknSxhpyaYlIIJ/Unum4sD8+MX3i2yRAE1HeazypCvy4Z3weukWLdl+PmLbiS0NCF6ykuZPEFFISiB08aVYLbTk11eVT5pN5mOkpv5O+PvUrxonxK9qARgMwqVMn9W+ICOb6cYW+U1jy2InS45CxruWvA6v313TZDEptl8KhOEe/Au6Cc8lHsuznfwFl4nDD3o8rg1Zi9zAgMBAAGjgYQwgYEwYAYDVR0RBFkwV4Igc3R1ZGVudC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2WGM2h0dHBzOi8vc3R1ZGVudC5taXQtaW50ZWdyYXRpb24ubGFkb2suc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQUalAJNcSpImmbNzkxXNzaLzaVhIwwDQYJKoZIhvcNAQEFBQADggEBAHq6UWwy5nK9qotqN0alNm/FDriwj8fzJyEyOzN5WX/adTB/SdDvJ9JiQc92cGTKl2hiJj68pD3hduoV//ETBreMiIbCAHcVT6x9mcbSCCASJsV9VgMJjsltaZlNSAwIlJrjwM1k94EoFhl+vdVr9zMOSYT46J0LOFEEf33yj5as4fz3vMydZTIeL1uYqBAi5EKzusY/EZJFtcJ5QRbM61d5VQ1kIsVxaltskEgPp3ao0p2+Ei8/Lqz4XGBeNZGynxYp6gcbs0+kGO80GrZkjkECDUoPuLLowdMRn/PQwPQ8UH02HIziYUqhQNHqGyDHulOnfa6ZzlsL7S8ieixWWes=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -95,4 +74,22 @@ Wes=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit-integration.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit.ladok.se-student-sp.xml b/swamid-2.0/student.mit.ladok.se-student-sp.xml
index 292bfd60..d6e7ee42 100644
--- a/swamid-2.0/student.mit.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.mit.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -34,8 +30,14 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.mit.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.mit.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT Studentgränsnitt</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.mit.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.mit.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.mit.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.mit.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,25 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.mit.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.mit.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNTCCAh2gAwIBAgIJAJ3icKR+gNdqMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHN0dWRlbnQubWl0LmxhZG9rLnNlMB4XDTE1MDIxMjA3MzEzOFoXDTI1MDIw
-OTA3MzEzOFowHzEdMBsGA1UEAxMUc3R1ZGVudC5taXQubGFkb2suc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3GvpMV8JsG+orqyQ1bx9vsley4AxO
-B7nDmfRwX63t22mpyBDer4ZMMwDxb8lNf0a9rzXyfacDh6UkbBghPB6w71onmt60
-rCozzqCUOYwyPwocEQZ9mxelc9dEyN1c8WhyIo6BnhQWPbPr7Y+EAihe4oOK16p1
-w+wyPlKxNRj1g0zOJHvvmg2vbXALyt1xJ60y7vSWKiZEMDpclnTwHCd2icU7AB5R
-EGBGxAV3rGVXQWzHZnDoP0NPr+OlzVbTowTAC7KoNlY0iBZwwtxyI1BolXgU4oN9
-Xlpnu/FroqFAlsCuyZCc3/VLNwiNl7wH8ZOYRBoy+6rJMPVBLf1TEA+ZAgMBAAGj
-dDByMFEGA1UdEQRKMEiCFHN0dWRlbnQubWl0LmxhZG9rLnNlhjBodHRwczovL3N0
-dWRlbnQubWl0LmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYE
-FGy8rVzZpS2hPPUQeQeK1LWAOhgZMA0GCSqGSIb3DQEBBQUAA4IBAQB2IVqSGbpJ
-qO1bh7aHHdnnmw2Wbc3jnyU8dhbJ4PuEii1m6rbu8b+pdpwYjqit1UZ2RVjzaL38
-4V8hCooWybOQ5phNj7pohwUqliPOX4rockK9nAhk0MT69KYArh+VfsvBmN9sb5uf
-Cy4YS1P+vUWvWJqwmCwuKvBuCu3K8zI6QELhHFpafXTvkz+K+z3A22G1FigBqsMT
-ua2Dzh2zE+wfcRwqZ+GwH0mN0iqxDJUKqgs9aEsl8Q9iHH1cmBYOMQnCaCIbnd6l
-Xp4VZ3QgIMowFfU+rOyCR3jMz8kW9hLPuIGQXq65q14lETenxSds3d9Z6TGB6Xbc
-aQxSEmvTJulB
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDNTCCAh2gAwIBAgIJAJ3icKR+gNdqMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNVBAMTFHN0dWRlbnQubWl0LmxhZG9rLnNlMB4XDTE1MDIxMjA3MzEzOFoXDTI1MDIwOTA3MzEzOFowHzEdMBsGA1UEAxMUc3R1ZGVudC5taXQubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3GvpMV8JsG+orqyQ1bx9vsley4AxOB7nDmfRwX63t22mpyBDer4ZMMwDxb8lNf0a9rzXyfacDh6UkbBghPB6w71onmt60rCozzqCUOYwyPwocEQZ9mxelc9dEyN1c8WhyIo6BnhQWPbPr7Y+EAihe4oOK16p1w+wyPlKxNRj1g0zOJHvvmg2vbXALyt1xJ60y7vSWKiZEMDpclnTwHCd2icU7AB5REGBGxAV3rGVXQWzHZnDoP0NPr+OlzVbTowTAC7KoNlY0iBZwwtxyI1BolXgU4oN9Xlpnu/FroqFAlsCuyZCc3/VLNwiNl7wH8ZOYRBoy+6rJMPVBLf1TEA+ZAgMBAAGjdDByMFEGA1UdEQRKMEiCFHN0dWRlbnQubWl0LmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQubWl0LmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFGy8rVzZpS2hPPUQeQeK1LWAOhgZMA0GCSqGSIb3DQEBBQUAA4IBAQB2IVqSGbpJqO1bh7aHHdnnmw2Wbc3jnyU8dhbJ4PuEii1m6rbu8b+pdpwYjqit1UZ2RVjzaL384V8hCooWybOQ5phNj7pohwUqliPOX4rockK9nAhk0MT69KYArh+VfsvBmN9sb5ufCy4YS1P+vUWvWJqwmCwuKvBuCu3K8zI6QELhHFpafXTvkz+K+z3A22G1FigBqsMTua2Dzh2zE+wfcRwqZ+GwH0mN0iqxDJUKqgs9aEsl8Q9iHH1cmBYOMQnCaCIbnd6lXp4VZ3QgIMowFfU+rOyCR3jMz8kW9hLPuIGQXq65q14lETenxSds3d9Z6TGB6XbcaQxSEmvTJulB</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,4 +74,22 @@ aQxSEmvTJulB
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.test.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.test.grayzone.ladok.se-student-sp.xml
deleted file mode 100644
index ede0d914..00000000
--- a/swamid-2.0/student.test.grayzone.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.test.grayzone.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.test.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.test.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.test.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.test.grayzone.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.test.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.test.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAOowkJXVqISdMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
-BAMTHnN0dWRlbnQudGVzdC5ncmF5em9uZS5sYWRvay5zZTAeFw0xNjAzMjMwODM2
-MTVaFw0yNjAzMjEwODM2MTVaMCkxJzAlBgNVBAMTHnN0dWRlbnQudGVzdC5ncmF5
-em9uZS5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOGU
-NKa5sTalFItChmOxO4Z0yv6bxxgjLl2ocYUdQ1jA9Kh6YU9REbKwsQEmFXzp4J2f
-dG2oWf2Jdf0mjBohQY/GAr6Lgy+2gtyc46G0Rz9mDgH4WuGN+wGeSJ6PQmbVO6pZ
-lpSlFdes3lmxS50aMEcO8HefZjb59UEJXzlzVNHKpX3pi684WvpsLa8h42lLLorZ
-QlknnFZP6H+ANBJ1K70T1/mknGqET791EU5KcK+EAW7eLJxuiJtEFbT04Ax7heSY
-Ps3eg7i3QrL/Sah2aWp1JcBRJ0fzAZqAPgmD9wW9jI4PrBAaLm6Aginb4jy8IvaO
-CFZC+5HIGuViHHX7iz8CAwEAAaN7MHkwWAYDVR0RBFEwT4Iec3R1ZGVudC50ZXN0
-LmdyYXl6b25lLmxhZG9rLnNlhi1odHRwczovL3N0dWRlbnQudGVzdC5ncmF5em9u
-ZS5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFCnD8SZEql3o+hm3K4Q7AKxag9yy
-MA0GCSqGSIb3DQEBCwUAA4IBAQADTKXCoXrQxJz7ZWVOqLhTLAroHZBNO2iB9gqO
-BpyHScmT424Y91yaGgNN9hIY27v2NvkYrsgkB4IkwH96xpKwthQlSIQHqjk3xnOU
-HWcj4hLCvA2TLWNARRRcUuVJWaX9bqUZVdkySe3z/bh6t+pWTGVCcM+7STDGx5ai
-kC++gEkI/T09nbYiBFV6+WNM41z+DyhO9yGbKj6nhJqFo4A0jsw8Im8xoN+r969R
-Zq8CVQyNB59hRQFosEp1CYTocOE8N6apt6JeuZBIGEnpjxQIQ7D++/GHisdrqyVS
-3cs/hJKNAfqLA4JHw6hRIEVyLVvBbnbuEhWkPDhXcWl94OfN
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.test.ladok.se-student-sp.xml b/swamid-2.0/student.test.ladok.se-student-sp.xml
index adeb6d85..f84c0cff 100644
--- a/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.test.ladok.se-student-sp.xml
@@ -30,12 +30,14 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.test.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.test.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.test.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.test.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.test.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.test.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.test.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.test.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,24 +46,7 @@
         <ds:KeyName>student.test.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.test.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAz
-MTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5x
-gZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJ
-hGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMb
-tzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQ
-IJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEO
-E/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEA
-AaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczov
-L3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUA
-y16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGA
-HNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb
-6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2
-YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxc
-fUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/
-KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMfe9MUSIYwzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTAeFw0xNjAzMTcxMDQ0MTRaFw0yNjAzMTUxMDQ0MTRaMCAxHjAcBgNVBAMTFXN0dWRlbnQudGVzdC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoXQxzxa7rCjHFU3SiCf9W//E5xgZugxikwRTBus+1XiT9oNDSiztbFPTGsUv/PLaSeyPs6hqd2bpBh3yOOItb/PCQJhGLVWFXZHSBifX4Aa+bh18ZbXtIPT8P+LhNMesdh6DVnDo5Ksd2cvbHxRO9WlNMbtzNM5iUJZiVfwmkwo3Y5xbWQ3NPCinmMQPWLVl0gKteoouu5SrCUm6s/TFNNIspQIJRUlieSn0MUyYCidLpadbNEarcC5wX4Pn9viA4ZBimiUcOzbPyxUcdLdW3bHUEOE/F0b/+34N4oBUytLcFo4nTlUjWaKBSv7dwFAYt0UjATVp+LdMwZmBcgrvsCAwEAAaNpMGcwRgYDVR0RBD8wPYIVc3R1ZGVudC50ZXN0LmxhZG9rLnNlhiRodHRwczovL3N0dWRlbnQudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFEdfw76scgUAy16cvwoO7eZP/DQbMA0GCSqGSIb3DQEBCwUAA4IBAQAdEWyyTL9P5TTNX0NuJmGAHNR/yi/RUIZ8vbFzuuSsFmMnKN+iVyQqnS0cWsHXs/KWNdziHSHcQusKp0l8Zmmb6Dj2adzigSVW22GNdFsDSRUkKuI70SP0gWCjlQ6pezYCNzNlG85VnMRHWkP461l2YUmMJSKSreltDQGom/gj9JDiFxaGr7puePNSyYqVX4AFY81u+JB5+tTTgyNhZRxcfUO4UUy2FV9/ugZdSEQmuL2TcPi/Qjr7iYf421GeoBUvEWeANRekKCb5IRhvWmw/KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -89,4 +74,22 @@ KKCbhHGTmGZP2tQ6zng2z2GDI1/icN6GfRAuzgthsOqC74sM4tn8VoLT0IdDOPj5
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb.grayzone.ladok.se-student-sp.xml b/swamid-2.0/student.utb.grayzone.ladok.se-student-sp.xml
deleted file mode 100644
index 9e3bae39..00000000
--- a/swamid-2.0/student.utb.grayzone.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.utb.grayzone.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.utb.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.utb.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.utb.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.utb.grayzone.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.utb.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.utb.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAL6+vvBLbienMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQudXRiLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDExMzU1
-MVoXDTI2MDMxMjExMzU1MVowKDEmMCQGA1UEAxMdc3R1ZGVudC51dGIuZ3JheXpv
-bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrwO5t
-+t/WjW2ub3ds5fX0J1LKHHxX23zdhtgvZSvwhlJeJPzDaHVvDFs8A/hgCBcem+bJ
-XxtLsMG/uA2VMgDpG8dd1x/CtOBiLhehLLK44RwLG1A3Wf4BQgC9A9Yy+101ySDg
-QmTdPxPUoV/QdE2RNqIt7xtDU5xJsRR/TCcdPesYVNnvwJ/cTGpjJv4TwjFyds8C
-yt9tklRFO0QpcTTctN5jwHWOcS5F5XUz/yxymf0nIeVjcC+hBwYlRLSEVndTXH94
-Y3uEfD3Nr9Wh3fvVz3yFKvMvJ3+7rdAmazp8kr5ZFOz+mRp78WNWMEneeQ3E657w
-zeqNnnUn4WjDg1LbAgMBAAGjeTB3MFYGA1UdEQRPME2CHXN0dWRlbnQudXRiLmdy
-YXl6b25lLmxhZG9rLnNlhixodHRwczovL3N0dWRlbnQudXRiLmdyYXl6b25lLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUAoLT9XTxfcWhOBxQGxepp8ZhQR0wDQYJ
-KoZIhvcNAQELBQADggEBAFaVox+9QFZO6kud6xiIzTtdZA6UhfB7k7UdnpoTB5kp
-WgLtoBl10sEs4J4fdfNRqFmM0y6M6Ui2KMQ8CwVL3wPUiA4k6WmvX2wL7iNaULuh
-5NW6E6E1VV4AkF3aGXv+wP86oCR+7xUxGabJIP4A5wkE4EFnb5o8YfHHFlZ2kENF
-yZNMRxHA6hxBu4AUwVHn9w3NeLFvdz+VIoRdTCwJiKQIdOiIwh4uqdz+Nb27JawK
-FcB1uUnfHOFrWxR3hRPy/mxOtvCbBn1Ze80nVHwGUXnZU03EQD79EsrojE7X6Dy9
-APPgdPDSoTzmfWG0jod4DFTR1ldSdgpydyNVnmBMHaM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml b/swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml
deleted file mode 100644
index 100d218f..00000000
--- a/swamid-2.0/student.utb.uppfoljning.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.utb.uppfoljning.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.utb.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.utb.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.utb.uppfoljning.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.utb.uppfoljning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.utb.uppfoljning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDWDCCAkCgAwIBAgIJANRIJvqprHNXMA0GCSqGSIb3DQEBCwUAMCsxKTAnBgNV
-BAMTIHN0dWRlbnQudXRiLnVwcGZvbGpuaW5nLmxhZG9rLnNlMB4XDTE2MDMxODA4
-MzgzOVoXDTI2MDMxNjA4MzgzOVowKzEpMCcGA1UEAxMgc3R1ZGVudC51dGIudXBw
-Zm9sam5pbmcubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDHjfupZnJ8UUpOMpVTJcaliULDj1v+XeZ5zYmKe4Ufl9py/S7akmkq7PFoKUzn
-kBgi3XLBRfGfQPhupfCTnSID4j/BRRQTyfkuVOWbuvFLYUxaBkm5M4KLzr5GZEID
-j1EUiUoLBjksFJ5HC40H14psoAaRqwD53XoFJOjXd7ipCNeH3JgGz/C91ERzauCB
-9DYUZZfc8PB194uHm3EwwG6w8VGmxWaTNi0C0YWnQXs77nFlx86JK49G5j8Mib8h
-SrwyQ8nYoMkBgxhymh1IA5G1aKgyWabw7bqoKrelvus+ja4Y39yNdPiGmPSk27zo
-yoz05SaEnjTf2yCBvC7NELUVAgMBAAGjfzB9MFwGA1UdEQRVMFOCIHN0dWRlbnQu
-dXRiLnVwcGZvbGpuaW5nLmxhZG9rLnNlhi9odHRwczovL3N0dWRlbnQudXRiLnVw
-cGZvbGpuaW5nLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUwD9J7Pnqr8ElOe0f
-xNrNd+M8HckwDQYJKoZIhvcNAQELBQADggEBAJBrD9xcMsYcgBJfiAZpezzwVHbv
-E/27kqZ22MxR+r3JljGfejLsjC3G8Tjn8RQgpUYpPV/OyX4WkYMHL+4eWM4Z0gpD
-VYmcaCdX0LbxYikDlaSWLhH8sDBKdleFg+NFd0pP1WX/iOTJX40IP8yyliwhGBfy
-OvsSj/YrtegFw8ldfmiM+GTsFBrVYvOMgrnN1wxQA3U0kjAnc+Ca8LIAYRnRuqHY
-hHgTDaGq27tcqC99MT5eOQBGn+C/rX8NYo7aoaYRA3bQiBpvTiwVwMxitp9L4gtG
-ERSUoBLzl0s9hzeUVctbKwHWqVcKqz7KWX+X7Zu/1Sh7pmJTUUwgoChDnXc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/student.utb3.ladok.se-student-sp.xml b/swamid-2.0/student.utb3.ladok.se-student-sp.xml
index 4933ae15..6ed77bc2 100644
--- a/swamid-2.0/student.utb3.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utb3.ladok.se-student-sp.xml
@@ -27,16 +27,18 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utb3.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utb3.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.utb3.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.utb3.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.utb3.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.utb3.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.utb3.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.utb3.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.utb3.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utb3.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utb3.ladok.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -44,25 +46,7 @@
         <ds:KeyName>student.utb3.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.utb3.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPP2nJxsHmu/MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFXN0dWRlbnQudXRiMy5sYWRvay5zZTAeFw0xNzA0MTMxMjA1NDhaFw0yNzA0
-MTExMjA1NDhaMCAxHjAcBgNVBAMTFXN0dWRlbnQudXRiMy5sYWRvay5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM93d+V1u/r9a9SvOOhPeHW2b7Hj
-WNqMwU/iRUwAejGtmX2K9DGVIfeg2qeOZlkF2OLd4J4FMDgpDnK6nY+DzGmgcKJ3
-jFzyY4jjOnYLds0wYghPiWdgVp+zFaHfPHpdcPb4QA2TZjTm0LhQKuLUXG7nkoNN
-c0RfnEF9tn5hzqfNAej+pda1LFP756UfzGKHCEzjqAVgltfeQ7xAFR06xOAQud1P
-UEsg56xahf9QFvMgp+Ph5El6xC+kEpxpaM68mYA3C6NJF1PhT6kOA49v0bIHEbD1
-9jwrZ9kNhUFanoJKZh8JzY8j+FkHtoVQojGPk9stTzxXeeVGEgFVednV7skCAwEA
-AaNtMGswSgYDVR0RBEMwQYIVc3R1ZGVudC51dGIzLmxhZG9rLnNlhihodHRwczov
-L3N0dWRlbnQudXRiMy5sYWRvay5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBTqdDY6
-aPnquME+6pcwboEqCjsNYjANBgkqhkiG9w0BAQsFAAOCAQEALpVRzlq2V325WB+f
-YYUg0jUUfkPd/QcYIEReoM3i1kVNUurRPTQyoxDNqXTqIUtYrsOLPrcH+LKPQKwt
-MlnIbdct5OptqNF3jK8xOm0FZ6PYCp8AwhVIWA3Z3XeeG5B6nUjTWIoW8kWC5Pa7
-9+Ol2bZtaBGAlzFTTZkH49HZln1I+CE35ijgFMG2zojCislvu15ltJzXE4GlbiL2
-fnjUfFRvc4G+c8zG1CP5h8u+6VTHHZnbAf57VtXM7SJxo+Dbu22IzE7y6e47OtJ8
-RL6aXz/TTMzfLIwlNJC4JocOMZmGaj+9gtGHpnMqUs/cs6vm89MhPX33wLEUOJ/X
-axXP9g==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPP2nJxsHmu/MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMTFXN0dWRlbnQudXRiMy5sYWRvay5zZTAeFw0xNzA0MTMxMjA1NDhaFw0yNzA0MTExMjA1NDhaMCAxHjAcBgNVBAMTFXN0dWRlbnQudXRiMy5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM93d+V1u/r9a9SvOOhPeHW2b7HjWNqMwU/iRUwAejGtmX2K9DGVIfeg2qeOZlkF2OLd4J4FMDgpDnK6nY+DzGmgcKJ3jFzyY4jjOnYLds0wYghPiWdgVp+zFaHfPHpdcPb4QA2TZjTm0LhQKuLUXG7nkoNNc0RfnEF9tn5hzqfNAej+pda1LFP756UfzGKHCEzjqAVgltfeQ7xAFR06xOAQud1PUEsg56xahf9QFvMgp+Ph5El6xC+kEpxpaM68mYA3C6NJF1PhT6kOA49v0bIHEbD19jwrZ9kNhUFanoJKZh8JzY8j+FkHtoVQojGPk9stTzxXeeVGEgFVednV7skCAwEAAaNtMGswSgYDVR0RBEMwQYIVc3R1ZGVudC51dGIzLmxhZG9rLnNlhihodHRwczovL3N0dWRlbnQudXRiMy5sYWRvay5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBTqdDY6aPnquME+6pcwboEqCjsNYjANBgkqhkiG9w0BAQsFAAOCAQEALpVRzlq2V325WB+fYYUg0jUUfkPd/QcYIEReoM3i1kVNUurRPTQyoxDNqXTqIUtYrsOLPrcH+LKPQKwtMlnIbdct5OptqNF3jK8xOm0FZ6PYCp8AwhVIWA3Z3XeeG5B6nUjTWIoW8kWC5Pa79+Ol2bZtaBGAlzFTTZkH49HZln1I+CE35ijgFMG2zojCislvu15ltJzXE4GlbiL2fnjUfFRvc4G+c8zG1CP5h8u+6VTHHZnbAf57VtXM7SJxo+Dbu22IzE7y6e47OtJ8RL6aXz/TTMzfLIwlNJC4JocOMZmGaj+9gtGHpnMqUs/cs6vm89MhPX33wLEUOJ/XaxXP9g==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,4 +74,22 @@ axXP9g==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utb3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 6e5152ed..ecc83af0 100644
--- a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -30,12 +30,14 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.utbildning.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.utbildning.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.utbildning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.utbildning.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.utbildning.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.utbildning.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.utbildning.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.utbildning.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.utbildning.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,25 +46,7 @@
         <ds:KeyName>student.utbildning.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.utbildning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJf2ynPuYULKMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
-BAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTAeFw0xNzAzMjQxNDUxNDla
-Fw0yNzAzMjIxNDUxNDlaMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5s
-YWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4XeuF9xJaF
-cFLNlTx7u9hX6yYgJFFVurBcbOCV4qDY8rGVauCN2GLtw8pRnrJFEKPq4lwviYNH
-tJS1BkfvMq0UFJi8EqXtRfBg2QgfQ+KktIt7HOe4IeA7yxUrNBKqpKEcljJwUhsY
-yGlVbasMfQWlRvhvH2avklRindoCbUvONT0+z7IK2FcVsnKGHmsyWPPqvKD23UJ6
-QZIBEo/XlAg7OdhZGX6Dh5JtJf5MFSBsqCXaF9KjZ42ldU4GjpX+8Wtqh3uzBDsH
-ycmOuNfl+wDerq9bRm9IA+76Pc5eZd7KyfstJICmOj2af9J9qg9ciMXzTVONck2A
-PQUJy8qsRzkCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudC51dGJpbGRuaW5n
-LmxhZG9rLnNlhi5odHRwczovL3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZS9z
-dHVkZW50LXNwMB0GA1UdDgQWBBQkngzmdP9IXbODkzUI6p4apPdfejANBgkqhkiG
-9w0BAQsFAAOCAQEAW1Fy6HmheQ3gOJCDAATrBKL6K0Omq6wSnB3EzFkhn4svkgJu
-ylY+HTCy7jAmZN/HYqm2K66Y09hL0J0ZdrNFJWNTqoCUz8OBslWNSOXpU9Ph4Vgf
-zHYTxktGem+UKIbfI99YJ/4eP7Xq1Azej99MiBRMDkr0FFKFncJpCuPY/Ng8iPd/
-Sd/IYcjOIcQI0JUWy73xkUQ/ivyeFK8eMJmKTzTyJZvokzOFOxWtUSJdMbLqHmCJ
-nSTxMq8dDeXDdQlyrgG89v6eQEZuMjp6vKTQh1JOZZKQbu6dHlMLRsEncWI5h8kp
-bVJYS5mzSPM+jyZaYGPSQlr33OkUbNSYzJhPJA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJf2ynPuYULKMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTAeFw0xNzAzMjQxNDUxNDlaFw0yNzAzMjIxNDUxNDlaMCYxJDAiBgNVBAMTG3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4XeuF9xJaFcFLNlTx7u9hX6yYgJFFVurBcbOCV4qDY8rGVauCN2GLtw8pRnrJFEKPq4lwviYNHtJS1BkfvMq0UFJi8EqXtRfBg2QgfQ+KktIt7HOe4IeA7yxUrNBKqpKEcljJwUhsYyGlVbasMfQWlRvhvH2avklRindoCbUvONT0+z7IK2FcVsnKGHmsyWPPqvKD23UJ6QZIBEo/XlAg7OdhZGX6Dh5JtJf5MFSBsqCXaF9KjZ42ldU4GjpX+8Wtqh3uzBDsHycmOuNfl+wDerq9bRm9IA+76Pc5eZd7KyfstJICmOj2af9J9qg9ciMXzTVONck2APQUJy8qsRzkCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudC51dGJpbGRuaW5nLmxhZG9rLnNlhi5odHRwczovL3N0dWRlbnQudXRiaWxkbmluZy5sYWRvay5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBQkngzmdP9IXbODkzUI6p4apPdfejANBgkqhkiG9w0BAQsFAAOCAQEAW1Fy6HmheQ3gOJCDAATrBKL6K0Omq6wSnB3EzFkhn4svkgJuylY+HTCy7jAmZN/HYqm2K66Y09hL0J0ZdrNFJWNTqoCUz8OBslWNSOXpU9Ph4VgfzHYTxktGem+UKIbfI99YJ/4eP7Xq1Azej99MiBRMDkr0FFKFncJpCuPY/Ng8iPd/Sd/IYcjOIcQI0JUWy73xkUQ/ivyeFK8eMJmKTzTyJZvokzOFOxWtUSJdMbLqHmCJnSTxMq8dDeXDdQlyrgG89v6eQEZuMjp6vKTQh1JOZZKQbu6dHlMLRsEncWI5h8kpbVJYS5mzSPM+jyZaYGPSQlr33OkUbNSYzJhPJA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -90,4 +74,22 @@ bVJYS5mzSPM+jyZaYGPSQlr33OkUbNSYzJhPJA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
index eb05363e..e1976d02 100644
--- a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.verifiering1.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -34,12 +30,14 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.verifiering1.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.verifiering1.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.verifiering1.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.verifiering1.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.verifiering1.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -48,25 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.verifiering1.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.verifiering1.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPUhLJXX8MoBMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlMB4XDTE2MDkwNTE0MDY1
-OVoXDTI2MDkwMzE0MDY1OVowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmlu
-ZzEubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7Px8h
-hcULhJrmgq2MwxLRFoRJTR4Yr4ooJ3hJvOgVgMwk/jwAAQKUjJPBsLZ4a9ToSsSG
-TnyozXFgkQ1lB+rZtxaIi++Wkw8law0ObJLlMfSLuIlZFzJkyFo3HWAnf1U9Gpxd
-bdiWmQYwoAPUhouEc27MNWXyGNbdBUTHL+fG6rV6o8H0KLtn4ZIW3ASte/kfYVbG
-UyOgDW2pYdmPQvbknq+LcEw3UYt1qhGWADaPhLzH2LpLpTmtXfuZW4m9iPVCK4iQ
-hFU9tXzjhMtXOLfxmmPNbTpXJ1XKjxNWfFddFqRMsZcMA3T4EG3Ear4HkJwIUyqf
-M1Bouht7KWwK4WnhAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZp
-ZXJpbmcxLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcxLmxh
-ZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFLhXNKGeG1noLfc7DeO7/sYWlHVp
-MA0GCSqGSIb3DQEBBQUAA4IBAQBLefoziXmXeboXc+tjngPHhjoj1FMWntYwHYCd
-KbjQiR7/HL4NPqQMyGgtKUdwLXOmKS+N1Af63bOkGYFIypT+yho7o589uQH4AtL5
-EAX+tt0hmbZMD94Gy2KRScFN850Ku8WPoPAobx2Hnp+U0Wh+XLdG2D3QPvlZlvgI
-KARnhHKvBYURwuiCPAj+n6Tn+5hyMmK/2qXXaujMND28zdPghR3wsGJB3vpWszU2
-UNi1hwmtckifcwt6xHLEhkey12JcOGx8wFAvRs+7nV9otWcL09pmu0q10+IuQs73
-0G9BDDPRMrswTNNWiYPHyFuwXZs0b/M+cUTnFKHgbDSLoW4I
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJAPUhLJXX8MoBMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXN0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlMB4XDTE2MDkwNTE0MDY1OVoXDTI2MDkwMzE0MDY1OVowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmluZzEubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7Px8hhcULhJrmgq2MwxLRFoRJTR4Yr4ooJ3hJvOgVgMwk/jwAAQKUjJPBsLZ4a9ToSsSGTnyozXFgkQ1lB+rZtxaIi++Wkw8law0ObJLlMfSLuIlZFzJkyFo3HWAnf1U9GpxdbdiWmQYwoAPUhouEc27MNWXyGNbdBUTHL+fG6rV6o8H0KLtn4ZIW3ASte/kfYVbGUyOgDW2pYdmPQvbknq+LcEw3UYt1qhGWADaPhLzH2LpLpTmtXfuZW4m9iPVCK4iQhFU9tXzjhMtXOLfxmmPNbTpXJ1XKjxNWfFddFqRMsZcMA3T4EG3Ear4HkJwIUyqfM1Bouht7KWwK4WnhAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcxLmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFLhXNKGeG1noLfc7DeO7/sYWlHVpMA0GCSqGSIb3DQEBBQUAA4IBAQBLefoziXmXeboXc+tjngPHhjoj1FMWntYwHYCdKbjQiR7/HL4NPqQMyGgtKUdwLXOmKS+N1Af63bOkGYFIypT+yho7o589uQH4AtL5EAX+tt0hmbZMD94Gy2KRScFN850Ku8WPoPAobx2Hnp+U0Wh+XLdG2D3QPvlZlvgIKARnhHKvBYURwuiCPAj+n6Tn+5hyMmK/2qXXaujMND28zdPghR3wsGJB3vpWszU2UNi1hwmtckifcwt6xHLEhkey12JcOGx8wFAvRs+7nV9otWcL09pmu0q10+IuQs730G9BDDPRMrswTNNWiYPHyFuwXZs0b/M+cUTnFKHgbDSLoW4I</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -94,4 +74,22 @@ UNi1hwmtckifcwt6xHLEhkey12JcOGx8wFAvRs+7nV9otWcL09pmu0q10+IuQs73
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering1.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
index 039f45e2..93f26c04 100644
--- a/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering2.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.verifiering2.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -34,12 +30,14 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.verifiering2.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.verifiering2.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.verifiering2.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.verifiering2.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.verifiering2.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.verifiering2.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.verifiering2.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -48,25 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.verifiering2.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.verifiering2.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANhZ+lRwig0ZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlMB4XDTE2MTEwMzEzMTAz
-NFoXDTI2MTEwMTEzMTAzNFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmlu
-ZzIubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeQP5y
-KFSNh3FnbQIXyMkPb9iKemr7WUb91H1fmxXiwLFwrDwq0/ys+SD32Cz7D/ZM1yO9
-mR6Vl2hUic3CJnB3f4HxYk/MXKU21bRRXVOsVNDPcVmWHg6jVbDCRG2v5Ao1o+xN
-qQZP3GktTMjU6/vS1WsR/jfj5zUa73eLlsDV1iNNg6y7loEbdYq59VDIe8DaRElQ
-T0kGTQkDT/MVYsq1y2QBoDbLQs+fmYLByq9/aUzRAnvgsF3G7DNpHQpbwsLVmMjZ
-08nAsayHw6cUvNPxVCJZHjqOCxbpGHnXb2MXG3nKPzT3ghI7sj0rHcUXtpRH3Sx4
-KRjAx1jFrW4ahD5LAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZp
-ZXJpbmcyLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcyLmxh
-ZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFPARxvZzMJsGmujx/cLGmNdFl7Hg
-MA0GCSqGSIb3DQEBBQUAA4IBAQCYWvLd5/8NPhLRFFPnOWAsBNeKjoaqMSI4QoM3
-HvEn7uPfR0UFJdx48+AKGSpGGFgZnd4AEGSNqEHivlmBfMBXpyKw1nQv5n/4jgMQ
-G3HV2lA1p9Ci9LoSMPyEQO+vhEcJrP5FtlSPilwV/fle3FcWr2wGc9c7yDpUKghm
-ByiBCBY3OjytRPllU4o4xJrE9M5IMYtdRWSpRxtohbnugBYV8iIg+UiesLPsrYGD
-6bW1zq3ALcJEW5NWiN/GANdzO/gXpHqDKSXJGTJ8w3yqBsGaAC/PH7fgNNdx5X7E
-qRNJvl1XCHSDHrGmnIDQdxeZhKEfTjzqLYUTT/OfhDB3gwDN
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANhZ+lRwig0ZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXN0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlMB4XDTE2MTEwMzEzMTAzNFoXDTI2MTEwMTEzMTAzNFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmluZzIubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeQP5yKFSNh3FnbQIXyMkPb9iKemr7WUb91H1fmxXiwLFwrDwq0/ys+SD32Cz7D/ZM1yO9mR6Vl2hUic3CJnB3f4HxYk/MXKU21bRRXVOsVNDPcVmWHg6jVbDCRG2v5Ao1o+xNqQZP3GktTMjU6/vS1WsR/jfj5zUa73eLlsDV1iNNg6y7loEbdYq59VDIe8DaRElQT0kGTQkDT/MVYsq1y2QBoDbLQs+fmYLByq9/aUzRAnvgsF3G7DNpHQpbwsLVmMjZ08nAsayHw6cUvNPxVCJZHjqOCxbpGHnXb2MXG3nKPzT3ghI7sj0rHcUXtpRH3Sx4KRjAx1jFrW4ahD5LAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmcyLmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFPARxvZzMJsGmujx/cLGmNdFl7HgMA0GCSqGSIb3DQEBBQUAA4IBAQCYWvLd5/8NPhLRFFPnOWAsBNeKjoaqMSI4QoM3HvEn7uPfR0UFJdx48+AKGSpGGFgZnd4AEGSNqEHivlmBfMBXpyKw1nQv5n/4jgMQG3HV2lA1p9Ci9LoSMPyEQO+vhEcJrP5FtlSPilwV/fle3FcWr2wGc9c7yDpUKghmByiBCBY3OjytRPllU4o4xJrE9M5IMYtdRWSpRxtohbnugBYV8iIg+UiesLPsrYGD6bW1zq3ALcJEW5NWiN/GANdzO/gXpHqDKSXJGTJ8w3yqBsGaAC/PH7fgNNdx5X7EqRNJvl1XCHSDHrGmnIDQdxeZhKEfTjzqLYUTT/OfhDB3gwDN</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -94,4 +74,22 @@ qRNJvl1XCHSDHrGmnIDQdxeZhKEfTjzqLYUTT/OfhDB3gwDN
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
index de3a3d9a..ff29db47 100644
--- a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.verifiering3.ladok.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -34,12 +30,14 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.verifiering3.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web student.verifiering3.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://student.verifiering3.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.verifiering3.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://student.verifiering3.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -48,25 +46,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>student.verifiering3.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=student.verifiering3.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANsnL5BGPQW4MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlMB4XDTE3MDUwNTA5MjAx
-OFoXDTI3MDUwMzA5MjAxOFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmlu
-ZzMubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3QvP/
-gv/vw2kldqa3rvfHn3wrhsaw2XU6x6E1UahoyCDxbfa9rCcVwDMdZA0tXEvAZwlL
-oZ9BhtfpeUTtpDkYbJ+KLERt0AoZWMY6VbS/O14zuUOdsK8lVgnSbdZC4HKUvaZ9
-M7QVGpvvus42V6NHIozAlSjgoq4l4fGQ8tMGYce/vUX39OoQQbQM+CYI0nEeZQl9
-BLZfQ4gZri2sZJqe6XtDgosafXskBwasEF+EIxaQG0uyk8P1fwOvG6yomt5x72Zj
-EON2e/cVVauZE4sq7C6CAATyBYfr3SiMKwPNfWf4QqGZy+vVeCZ632DlIDlgdTAm
-/mKNneMO6AJrfmIjAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZp
-ZXJpbmczLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmczLmxh
-ZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFIunHXlNt0Hh7u+B/w1BPJMzendI
-MA0GCSqGSIb3DQEBCwUAA4IBAQBnwH0RHk66u5RTBPB90tZy56igXplUZQiZ45Xs
-1pdFHkaKlhldssDXSZa64TfJIaaXLt/Kf0d4CE1jxSi6y76L+PaeXvCHB/Uu5Xge
-IDYjHDWDVMNOU3smyECzVBUq703kdQ/YsXHG4AsUs8Jms/ch81KCjFFWicdy6/j4
-KRRDKzw2Hm+brJ0fYd5qrkbtm883PDVSMzz2K2HeZKBAmnEfeHgdiQhhOMD/6eAA
-dilLZZdiV4S3BMqr/E74Fg3nLYdadL4QKxE9qFw+XQJTM5gB2PohTxOCL1DdOMNE
-fc7cHBpwT44JCllErveMtQyLVozNsl3kC0KrSnyn7z+gshrg
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDUDCCAjigAwIBAgIJANsnL5BGPQW4MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNVBAMTHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlMB4XDTE3MDUwNTA5MjAxOFoXDTI3MDUwMzA5MjAxOFowKDEmMCQGA1UEAxMdc3R1ZGVudC52ZXJpZmllcmluZzMubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3QvP/gv/vw2kldqa3rvfHn3wrhsaw2XU6x6E1UahoyCDxbfa9rCcVwDMdZA0tXEvAZwlLoZ9BhtfpeUTtpDkYbJ+KLERt0AoZWMY6VbS/O14zuUOdsK8lVgnSbdZC4HKUvaZ9M7QVGpvvus42V6NHIozAlSjgoq4l4fGQ8tMGYce/vUX39OoQQbQM+CYI0nEeZQl9BLZfQ4gZri2sZJqe6XtDgosafXskBwasEF+EIxaQG0uyk8P1fwOvG6yomt5x72ZjEON2e/cVVauZE4sq7C6CAATyBYfr3SiMKwPNfWf4QqGZy+vVeCZ632DlIDlgdTAm/mKNneMO6AJrfmIjAgMBAAGjfTB7MFoGA1UdEQRTMFGCHXN0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlhjBodHRwczovL3N0dWRlbnQudmVyaWZpZXJpbmczLmxhZG9rLnNlL3N0dWRlbnQtc3AwHQYDVR0OBBYEFIunHXlNt0Hh7u+B/w1BPJMzendIMA0GCSqGSIb3DQEBCwUAA4IBAQBnwH0RHk66u5RTBPB90tZy56igXplUZQiZ45Xs1pdFHkaKlhldssDXSZa64TfJIaaXLt/Kf0d4CE1jxSi6y76L+PaeXvCHB/Uu5XgeIDYjHDWDVMNOU3smyECzVBUq703kdQ/YsXHG4AsUs8Jms/ch81KCjFFWicdy6/j4KRRDKzw2Hm+brJ0fYd5qrkbtm883PDVSMzz2K2HeZKBAmnEfeHgdiQhhOMD/6eAAdilLZZdiV4S3BMqr/E74Fg3nLYdadL4QKxE9qFw+XQJTM5gB2PohTxOCL1DdOMNEfc7cHBpwT44JCllErveMtQyLVozNsl3kC0KrSnyn7z+gshrg</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -94,4 +74,22 @@ fc7cHBpwT44JCllErveMtQyLVozNsl3kC0KrSnyn7z+gshrg
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/su.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/su.integrationstest.ladok.se-gui-sp.xml
deleted file mode 100644
index 94f5727b..00000000
--- a/swamid-2.0/su.integrationstest.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://su.integrationstest.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok su.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok su.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://su.integrationstest.ladok.se/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://su.integrationstest.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>su.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=su.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJwX/KkBYYmGMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHN1LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2UwHhcNMTYwNjI3MTUxMjQ2
-WhcNMjYwNjI1MTUxMjQ2WjAnMSUwIwYDVQQDExxzdS5pbnRlZ3JhdGlvbnN0ZXN0
-LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl1drxWQj
-f/Q4B28kc2ONu7485rcPv09U0PIGfzROy9t3jl1rYgPlobTAB4Gx+/N2zHARgdnM
-h8bPSlsvAlhBEK+QW+UVKNjjVF7r9Xz7R5dFXuZaUfA9RNszZpXCY9BmGz+zBoVu
-TxmPscf99QaZhUvKH6SPUhJbfoHnNz2kMHWhk0TtLC+eqRseBwhYfDQd7/3d91H2
-OAB/auLjKVqk9bL/v5+LgWoogVxJH2sdI/dHuMHmb5wfC/ZnIhIihO6hSCRbgVeS
-5ccEsEAU0t43bFSuDXWmNSsyjo+iDQAY7rXXEWq+3Hq7CT83iADEDOjNp5icRZwW
-CPYwXxM3vo2lFQIDAQABo3cwdTBUBgNVHREETTBLghxzdS5pbnRlZ3JhdGlvbnN0
-ZXN0LmxhZG9rLnNlhitodHRwczovL3N1LmludGVncmF0aW9uc3Rlc3QubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBTmO9rZzjQsc06xG1mdrcwlUibNGjANBgkqhkiG
-9w0BAQUFAAOCAQEATzIjE3taFTz5AaASecYDhMZKTXoFttDsF4oqslMgD/vYm4Vn
-qEway+enTwMG+xnLqnGplSRFpaBehEU6dWVkkQhhSI5jfphkEceQtBKQlEunvFF3
-F40OuNpzC3SdmIBrrAFC2UxAiGlBr8L/8GkXNzKv93+/MhyAUgy4dWPY6V+P1qao
-avr4TmFlAFZ4ZgryalffJdm5gBR25Q+jYjWXNEvWXNXI5km2f/EdC7UGLUTPh8qi
-O4qRt9YUnwYFvxxEd9CuMyDnP3gdNwHN5eSxyW0vWmIURSxBTjpQmcd6gIB8OJXA
-yxej3zxDcjPR4XUHY1Cd8XYP3Pk5mpj4NNMSUQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su.integrationstest.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/su.student.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/su.student.integrationstest.ladok.se-student-sp.xml
deleted file mode 100644
index 5c0ca2a4..00000000
--- a/swamid-2.0/su.student.integrationstest.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://su.student.integrationstest.ladok.se/student-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok su.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok su.student.integrationstest.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://su.student.integrationstest.ladok.se:446/branded/HSK/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://su.student.integrationstest.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>su.student.integrationstest.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=su.student.integrationstest.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbjCCAlagAwIBAgIJAIKWOJM66GgiMA0GCSqGSIb3DQEBBQUAMC8xLTArBgNV
-BAMTJHN1LnN0dWRlbnQuaW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZTAeFw0xNjA2
-MjcxNTEyNTRaFw0yNjA2MjUxNTEyNTRaMC8xLTArBgNVBAMTJHN1LnN0dWRlbnQu
-aW50ZWdyYXRpb25zdGVzdC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJvkuyOGuxv67q97zjyRovRULvq3TWY8Kz1txEc85b8pBkmAlCx6
-lG3WaCUXG0tdXMGCNvIJMDCdL1l2UVDX7U9GkkwtoxCWHC2V91uJi/WdW/hqOkia
-Cu2awLJ00bSysMLi93E766DlpCvPHL4jIH0ISsWIOyBHk4X857Mr7LMG1rglWI6g
-iS0P14GNIjGXZRW1BAnXnVgLhm52bw6hD7TBXjJfmqoqzz2CVcpaiuCSV8vjWeFZ
-sdXeKR/OYfApMs9hwINl0iVujQG6FWLQCv/f0vkXiy8tM3aNWPA3LOE/6i3kPovX
-RVQC4xtA/9ShWyixL5JUpQOG0vACz3TE/NECAwEAAaOBjDCBiTBoBgNVHREEYTBf
-giRzdS5zdHVkZW50LmludGVncmF0aW9uc3Rlc3QubGFkb2suc2WGN2h0dHBzOi8v
-c3Uuc3R1ZGVudC5pbnRlZ3JhdGlvbnN0ZXN0LmxhZG9rLnNlL3N0dWRlbnQtc3Aw
-HQYDVR0OBBYEFEktNTKX4/1gj3RLdzsMdO2uKv0xMA0GCSqGSIb3DQEBBQUAA4IB
-AQAk5SPoOyVcEF5gQFcEthF+7/mb1lY2WBpVT2Nygq1LQ4xK16RAEs4WdvyDckAO
-dUfTmkqkuhgMdOdL6Z0kQHF6ivU7cSibQR7uy+zJ62vIqNPpa6W1t6nYRTA1lJ5+
-NJIqEBzywZ1Z9mZWEfEMiHv/hiEAzqCTKvglQZnbrw9VHXI4Y2WXnziHPKxwlkOc
-xzG2AVWHREzPdW5D/xGd5x3l19elCUyVXQlugvbUxFDy97uXVLXyUBIjHFlS6B0U
-08biGVuMCehk6e9OwYDKFRjahf0OSVlENEhwxlPSjzZTd9dZzycMFRlrjMPwJPnG
-zWr3LWCiM4fsoLN05xUWfQi1
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su.student.integrationstest.ladok.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.ar.ladok.se-gui-sp.xml
deleted file mode 100644
index 54e01035..00000000
--- a/swamid-2.0/www.ar.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ar.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ar.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ar.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ar.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.ar.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ar.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ar.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIJAO+2uVoFVCreMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3d3dy5hci5sYWRvay5zZTAeFw0xNTAzMDkxMDUwMjZaFw0yNTAzMDYxMDUw
-MjZaMBoxGDAWBgNVBAMTD3d3dy5hci5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKYjGNsHJkf3igFiVKZP6DQFrEP2/wEs28PNp10Y+6Wt
-Vf0XjNlPXIrBAP+RrF4rq4n4xZ3Ryi5LR1Pzt2cEnhgeNmE+xB7JImrMpVFZamix
-DBkUR13uDFt3c35SL2mHVPVXkM8rrMk11QD9Ca4D98puHof33+uqb+IBdSExOI5W
-RnoWZADDKXiuEtTWIByF4poX1JGLBw7JlPWIle2Lrr59np5Iv1praiO7Z3hzGVon
-ZyLGBsvXiuxmy6XuTdS81ezAvCDS9yc4hKGaNU9qZP5pWHGwL5+wkCOCcfdrpyRA
-XHfvolYJLkjEH8/SDzSbhhpT19x0kl4m9lD3GiVFlYcCAwEAAaNdMFswOgYDVR0R
-BDMwMYIPd3d3LmFyLmxhZG9rLnNlhh5odHRwczovL3d3dy5hci5sYWRvay5zZS9n
-dWktc3AwHQYDVR0OBBYEFEFa4zqp6UAaaJtspYGraqM6BNoTMA0GCSqGSIb3DQEB
-BQUAA4IBAQB6o/jHsH5F1BtNTD3uQ6PQthEooYUJ8DmiXsIZCzDbsvglApyDKkKr
-kfnF+tKJjgrqo/DRUUJj+KOjM2P1Dl6cYq9hm89L6SCludbaNyiK79DOwc9kw9C/
-12l/UW+Vn0kfulPhHMo1yvZWY/92CvSpo4dXmH2qkw+/tjFm99n+kWtqAJW3Lb3R
-3rhEoFytiTQioexDPmhsv9SQf5DTaQhsPDqrHTkPEPZGZJUV9I7AxONRygByH5wk
-7hRKASv6cy2KVlXNyCFrrSD3cmADGzSFT5IsF4sE0JJBD0h6Rt6gJJSg24UyABoS
-H/CUrMqzIaj5b69wuVOW7xn85e2cMOCw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ar.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.grayzone.ladok.se-gui-sp.xml
deleted file mode 100644
index 7f28bb4a..00000000
--- a/swamid-2.0/www.ate.grayzone.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ate.grayzone.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ate.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ate.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.ate.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.ate.grayzone.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ate.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ate.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOFbsjIjhL4IMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGXd3dy5hdGUuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTEwNTQ2WhcN
-MjYwMzEyMTEwNTQ2WjAkMSIwIAYDVQQDExl3d3cuYXRlLmdyYXl6b25lLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0n8ApDyLZ58CJBtW
-WtNfahUCB04p4a6toTAn9J2aX20HACHeJiOhNANcUGKCA2FRiuc7CjjITHRdmbQU
-bfR0efJrYeUtoksnSXREfbaJDFQATPYpnq2BMB1HSna2Cfv5SToHTgFE/46hO9Zg
-uq57w0HxMO9pqNggNG7I5IEhUF5+xihhPXHar1mYpjp3+zOdr+XJrIZ3Tq1nQPFA
-ZcKPSKFKfjA8lGqCImPCblPpg8Vgb7sPJiRHpVRpkLN9FSAGY1HW1gvtxFHe5TVy
-kgmrSbD07ejpIdOwIvt3mG5SpUmrt624TWqG/thU1zv3/PaiJ0i4zrPTZa5SNS8M
-GjnVpQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuYXRlLmdyYXl6b25lLmxhZG9r
-LnNlhihodHRwczovL3d3dy5hdGUuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBS/KhR5h4DRaP0c+BZ8cDE8R8827zANBgkqhkiG9w0BAQsFAAOCAQEA
-HVLqnI/jDRO3StabYrvbavL23VbdKX/JDUV9vRam6uR+e6pbKb0xmP3F7P87WYIU
-iJoJ3xR3NKfXsWVI4BCR0auhieCZcSbQumClfQuCy6fXxvpmmq4qIrlxdb6W6lz/
-C8vTQEetpqdtNG6IB62TfYPe9io7TnAgJpzWzZVxjp7UoXhK8vPyMK60Gah3iKxA
-syYvZm/MaTEqMHF2oO64rqUoZuqRZCWE9VbbvNvN86pGnFWKgZRcBRpLWfSNAZHt
-AF5ZO1tO/syhzq3svhBKw43krQdg+z8EGBzqFTALxf+XE5JsNxLPO3APW9qEweX+
-pSPgM5nsisjeJf8vs4ejpA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.ladok.se-gui-sp.xml
deleted file mode 100644
index 0138a0b5..00000000
--- a/swamid-2.0/www.ate.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ate.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ate.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ate.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ate.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ate.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.ate.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.ate.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ate.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ate.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAM9A/EFvH3nnMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
-BAMTEHd3dy5hdGUubGFkb2suc2UwHhcNMTYwMzE0MTMwMjUyWhcNMjYwMzEyMTMw
-MjUyWjAbMRkwFwYDVQQDExB3d3cuYXRlLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxxDoG4YR72KYS1/uPqADYdCHQotCJ7x9cTxV0As1
-CdkVlaTKUdmy/p+ahzn043P19KYCPz7G9EMHWw3qhr0fqZMrGrewg07akree3zfI
-baQJD7phHiwQ8UGo2Q2lorInth3Ave4IlaC+rUBtvoa3LsqRCKxqwYuesNcmsO98
-3RxXY29DW5oCtE03rd8OdKtSrItmJ8mxvEH+hGtSb9oMgrhyXYgjGRGySlR0LnbP
-t7UpjQGjLp6TLbXoLHiDu4t2jxS/IcR85q532k1Qjhy+WjEwxcMg2Gn74NnpARl4
-N10huJFnopx8DDpVf9F6aacz8nF/5M9oZAZuZKJdBc+UOwIDAQABo18wXTA8BgNV
-HREENTAzghB3d3cuYXRlLmxhZG9rLnNlhh9odHRwczovL3d3dy5hdGUubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBRPAFHovGUtyQwEvziKRmqJ8cbg3jANBgkqhkiG
-9w0BAQsFAAOCAQEAAUMLZd5+2AyiJL0mNgAt0hC+XR+8fnI91gUly8Q2uMtSdTMT
-vfIsygTpKkSgwm86DWRVLzHRXOGFhu+mAgVsQ0QE5p85ERoB58iGvRI4rcYtv0ie
-puPskX/E5j7gMRHaanBnP6X+vNQ08HEH3/m+Y7nolZkMtmKPlGuiGaHbghywy4WA
-zR3LAF9VtFJWm9tdt1FlP7R4goQAKJQpiV2PcYxyrzYd59SWE/Sa4ZNw04qh+HAv
-fbjk0oejOLjZ6uoEUjf9LLl6ie5zcFBQjXiTb+mXZUTbsy1FYNqYtXJmYNlxgZc3
-IS8RGYGqahuV0paHCbi4AHBtoYA6waPXxJVmKA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.resultat.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.resultat.ladok.se-gui-sp.xml
deleted file mode 100644
index d38f51f1..00000000
--- a/swamid-2.0/www.ate.resultat.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ate.resultat.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ate.resultat.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ate.resultat.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.ate.resultat.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.ate.resultat.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ate.resultat.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ate.resultat.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAL33q6wYZ/iYMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy5hdGUucmVzdWx0YXQubGFkb2suc2UwHhcNMTUwNDMwMTEwOTQ4WhcN
-MjUwNDI3MTEwOTQ4WjAkMSIwIAYDVQQDExl3d3cuYXRlLnJlc3VsdGF0LmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsiUgpXCWfEWIOYkU
-/6ihCl4kdjtnJ9UnPXxajFN2EI3TcgbUxOMLeKwdfGQCPhmupQPsz+6tJ6z/46IW
-JitUOsY1wzLSw68E0Voh5Z/NQdNLa4HHSAbompqKcdLO2djNKeOvMgdfj94omrRp
-9LKvUmLY0+dbltb3XyYqhR9yWKqUXBskh0V5grLQO1KGQOpNHQRJmZK+eHhnAFg5
-hqXLIR45pu76+2RHpV7Q1dUEaSZjWvtXLeGGudYXtAHa6Tar9XjHvnUPoZRM5wCT
-msOtSNdYrmhMVQJ0TntmdqQTVidbhEA77XmbAH4r4PD6DPFUZf7hmCtPzT9Snveg
-VghGdwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuYXRlLnJlc3VsdGF0LmxhZG9r
-LnNlhihodHRwczovL3d3dy5hdGUucmVzdWx0YXQubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBR9M31f7CdCJA48pwgxYPVCW76Y1zANBgkqhkiG9w0BAQUFAAOCAQEA
-cbdbe0pic7pucb2zNQJfTs7AMWjE4iECU8+ZD/w1ms9CICTesky+Ls+X5upU8IHA
-xIF7Gus5zQhzxAT8voBPpE8kzMt95NaITBIYCEZJK8GKRm5qEB5f+0s2ySMT5oa0
-7MPEjKYK/jXj8TBCGIaxu65yguNqEoqWGt+JU+gwActjEYuudAnpKNHbzANDL1CX
-ch1BQNQ/1KLb56MA5XtD6+TFKukuo0Ue6uf6SSr9Uc4EtTycicPg+e+RRwi1HhiU
-NcCCKYTIBQSYBIpHdjg1CQ0gWOnwfyJjFVC8QAuC79ODRdjItStcO3c06LoKqVwS
-3hhdmaLGW7LBj9QAMWGvCQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.resultat.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml
deleted file mode 100644
index 7a5a7760..00000000
--- a/swamid-2.0/www.ate.uppfoljning.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ate.uppfoljning.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ate.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ate.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Logo height="64" width="64">https://www.ate.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.ate.uppfoljning.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ate.uppfoljning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ate.uppfoljning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAM50CTo8vcWjMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHd3dy5hdGUudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUwOTE1MTk0OTA2
-WhcNMjUwOTEyMTk0OTA2WjAnMSUwIwYDVQQDExx3d3cuYXRlLnVwcGZvbGpuaW5n
-LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1xaVe7fM
-wH15zllNOZkwnvkI5vmNBIWmFFXGx+fgK5aoJhYmDc3c7eCotLTXnzJsCeFpelIM
-MfYBHu0EAfTBWi4/WfQz4yRXQit0JfO1shurGQFeKe4kMTxnVf+BrJSvu/kAHitE
-t4pg9OhhgyMnMaOOON81W31XVK793Wi1B6wRWNtedK1R6InPGsBaW+/1ef4O7d7u
-sgJZBnZw+zSyOeP88cQNyTEU9eiR98i3Vzg7D0gB4u24Q3U6L3ioyVXGOj+IJNC7
-JsO7cQZUisj1yKgNEskL028HPPMzEXccOkAKsT313bHNF/jRI8bUAuh+S9CoEnBN
-3xL1RrWJU8K6MQIDAQABo3cwdTBUBgNVHREETTBLghx3d3cuYXRlLnVwcGZvbGpu
-aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy5hdGUudXBwZm9sam5pbmcubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBT1BkMstixnC+ab1uCMPT25Kyzx0jANBgkqhkiG
-9w0BAQUFAAOCAQEAxxI4Vbl6i68RqbvTGKt58pZYkk/dP1JyeyDraZPY6KBC7rgd
-vgm580B7g3m24kicZbMiMCj0z3GxyxoEpgQuP8ESQk+S1NRZzVqeX0jvGvozlIOf
-1k7asGDKTqZP1c+y260sWuuzU/VZIH/p+qJmXKtK8YX95ArVvxZr2yjLspQfOLK5
-OqTR2DKWzLbkJQcG5hDnQ/EYa+OTbxp6UKeYQ2OScriCAakOkRntxMk6jrxg4b0+
-lX8dwmg8Mp9BuT1SxYDh3mV5JQMPzBT65+h8NAt3Df7p6rmfQeTzy92hMI9perKd
-DEEdI94A1MM6JIppqwHkwWgzUQo03hBtc1ypuQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ate.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.ar.ladok.se-gui-sp.xml
deleted file mode 100644
index 2f72816f..00000000
--- a/swamid-2.0/www.cvt.ar.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.ar.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.ar.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.cvt.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.cvt.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.cvt.ar.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.cvt.ar.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cvt.ar.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAPVWmu5mxULhMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3d3dy5jdnQuYXIubGFkb2suc2UwHhcNMTUwMzE4MTE0ODU2WhcNMjUwMzE1
-MTE0ODU2WjAeMRwwGgYDVQQDExN3d3cuY3Z0LmFyLmxhZG9rLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsxR1YHkQhEiORPIMcl28nUFuWo4/Q0ZE
-L0+kAk+TG5pXUKUXw3Vd5L0UANdYrsaiO/zLhAJunr4DLyLGh194JZJQ/fUpyejQ
-O+FyuDRWvC1hXJyPCkcbrKR7fxoZEm7qiwZMmklGnNiErVsH1KghXlaKNnfVhdjm
-xDdIB9DqsjIG4HGQruiX8wmCqw4MG9gykYuSgiEnfpciHT//Og5O3gp0V+IVu+La
-hlp/j9jqVm0BLI9PZtoDw06kgQN2YtEpsByxPqTl4cjZywv1OBu4Vo2e/dK2nloo
-/WIjUCGJqT/zpT5JjyEs4wutepLHXyLZ2MQQJu2aGFdfbTL2xKmqxwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghN3d3cuY3Z0LmFyLmxhZG9rLnNlhiJodHRwczovL3d3dy5j
-dnQuYXIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBSULZ+jZRClc+4bRQeAB16w
-HfYauDANBgkqhkiG9w0BAQUFAAOCAQEARYQE7B75Jfy1GZW3bTeOPiX4J84v6koq
-UcUe/prVC4qTJPwqY1a+ZbXfoSVcPbnatMPsSuSXApFs/RLaaXklIe3UIv5BlXBO
-ViHb5IFcYr95xia3Su3ZMu2i0lg0q2dokjD4am7mKfmXLgpqZ/+ZPzsfMMyANMsy
-jAenqf2xtyEW6YgqePAmrifAV4ZXHyEXTqVTOpppLgbHD2jhpsqohdXqGJ5YCD3W
-g8KSQ8E8AeUHfycYAWb4tXgl5uVODCh7QnGcb10n4UnM5HEoXewMCJfE1qu+Xlia
-MNw/haPNc2AivUytr5SD11Oz2N9PFr4ReEI/hJneRjRwLj9fp7rYKQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.ar.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.grayzone.ladok.se-gui-sp.xml
deleted file mode 100644
index d0b7001a..00000000
--- a/swamid-2.0/www.cvt.grayzone.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.grayzone.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.cvt.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.cvt.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.cvt.grayzone.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.cvt.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cvt.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAKYg5cljlFfLMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGXd3dy5jdnQuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MDg1MTUyWhcN
-MjYwMzEyMDg1MTUyWjAkMSIwIAYDVQQDExl3d3cuY3Z0LmdyYXl6b25lLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SvPRcE2m0x356V7
-AYAJE3FFkqhJC2DRIh3V73qhu8bW0eEiP1biuAjefC43Mz71/OAMdcPYqbz1NZH0
-yWD8HLKtHgc2uLTHGyxDtmdz3Qx3siEXHThkxPZ6ULXuXxn5nTAiRotTgpev24kI
-Z5XW2EuOYbug0ffLS7fTx2YjHATuWtlukeicog5q3QA+NTYKRr3nSoUPyTmjwjxW
-vuBMLmgkZbEDK83EfejsnAagC9Gf4uBErzT1BWhJtvHMCFe8xWWcygmfczxHC3Ui
-1oeX5a6tmtbQpHXq5JGSICuw1MwExNTzYPcGlxQTi2EsNf4xFOsekLAg/vcRLoQf
-ERTtWQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuY3Z0LmdyYXl6b25lLmxhZG9r
-LnNlhihodHRwczovL3d3dy5jdnQuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBQtwDy/NQNla4m2lX9LSz7dZv4jqDANBgkqhkiG9w0BAQsFAAOCAQEA
-fLPa5lVl8MWg+y4MW88Gyx6xJJ6VlPpp5Try8fveAHqg59aTsQP63slN9T/abEde
-+EeYGf/wSjwpPvry80RXwjpvIAxrI8tCzrmPcA8AScio20D0nzQEFLNgrkKi0TZM
-bfOYldl4Zy2E7BO6FWutqVYQKa4yWfKP3gM2VUIhZlQ1ZnjOjZ/btmhgk9KvhHXo
-aanLruOHz1dPK5bxvsGAfgaccCbU6Nkx1x5cjKfdlbLBtsCPZynSL6uIT+Tsx/3/
-kOhM8gni3b9R6PzNrSgXKf9+4brfTmQTQTaXsbONluEx7VH7i93XTorzvczhi6mt
-7968+n/qrUu+uywa/Z0NuQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.ladok.se-gui-sp.xml
deleted file mode 100644
index f6a38a9d..00000000
--- a/swamid-2.0/www.cvt.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.cvt.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.cvt.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.cvt.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.cvt.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cvt.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAKIBaYTXA/UKMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV
-BAMTEHd3dy5jdnQubGFkb2suc2UwHhcNMTYwMzE0MTI1MDE3WhcNMjYwMzEyMTI1
-MDE3WjAbMRkwFwYDVQQDExB3d3cuY3Z0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA1BtDJ0yOznNEjxYdreMZIj5PAp4XVHbVJ7SVUfXK
-qaaLntdnhfUu4j1HMTmJynODaTMmGU7WuToHFDSvS7hF8W+uNtHgTqZ6KCXJP43x
-xlUHhwJ6NgDyav4DHELDxx1gbvYsS8XSJFSdz5ndzQdE4JVjIEMzz1EH3VgUh5N3
-f0l1oW+t9+Y2hug/DR/xgiof6aC/WTfcRE5X3syL1eFDdi5HcLtuqwsIr2ye4Z53
-sNasbH+CqRk3rEuz0Xn2g1xUlVVmHUl1U8DH1bVDwNoGhooiL6UjrfBjPpjnIq1t
-KStatxJLwnEdvx1GEJBJ1OQBsKro2wVrXwAU3mC5cbegJQIDAQABo18wXTA8BgNV
-HREENTAzghB3d3cuY3Z0LmxhZG9rLnNlhh9odHRwczovL3d3dy5jdnQubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBQrZwcdAGn4uy7Y0JnGewF0MM1TxjANBgkqhkiG
-9w0BAQsFAAOCAQEAVJevYxixFe9Tv2RuJ9tEoUnp2bUyN/48rL5oDGb7JSeCNbg1
-kROhWl0wEU/Yf1gY4RUGFy+IWXMDMDY9hJ7MZE0mNE2tyXtUHA7sCJXeuyjo2cCA
-eY2fmu0U60jbzZgahmxGdekdiDLeLAIJymhkGmMYT3v56KNr7DgqJ5HBdKKjFoRQ
-s1sd9atFeunYVqeqKSg3RpuOQfFtTNUReoCpsNyIvYIJD/Fii/eivqDDggaoSPRJ
-WnimKipRjtjA/SYLRR/nyoXAsQni3B9LlCSTmM5P6ydj8OgynYTf49JII2/kVohu
-y9GY07YaqJzsN7hRR+MqdDquFOn1kbK8mY+1EQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.resultat.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.resultat.ladok.se-gui-sp.xml
deleted file mode 100644
index 8ac1b3d5..00000000
--- a/swamid-2.0/www.cvt.resultat.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.resultat.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.cvt.resultat.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.cvt.resultat.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.cvt.resultat.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.cvt.resultat.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.cvt.resultat.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cvt.resultat.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANRWEklIQkJdMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy5jdnQucmVzdWx0YXQubGFkb2suc2UwHhcNMTUwNjAxMTMwNzQ2WhcN
-MjUwNTI5MTMwNzQ2WjAkMSIwIAYDVQQDExl3d3cuY3Z0LnJlc3VsdGF0LmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BhXUfBLo/bFi1Uc
-aoc7ZzOhXTbELdSZ6uX+ta9Ka8g2E+KfaN6DkdvaHpGo1gySk4PZRUjXSV6iCDVe
-YLdaXxLTd5xCmlIGwXJjf9cnXkxf3NjCI1MKX1XrD8allnDx9shubn95Jb9up5VN
-rpjCPkGFdlGxXlHxrxEgCGAvb+OaGBM1W3Yxqd0F7svvPz7URfQN+lNNi3859Fpj
-GVEYiWaC3kpPuaDyaBLHTJzWI7XVmWvefscn3FBPaSJhkUBTD916OsVt0reh3Vpk
-T39elsIgPgFZnXnjy2q4c9oCagoVzgRy2F4YkS0KP4AAUsGfMallyELVR8UkjXy4
-KSS9RwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuY3Z0LnJlc3VsdGF0LmxhZG9r
-LnNlhihodHRwczovL3d3dy5jdnQucmVzdWx0YXQubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBSdSVS95edPqMh1SEt3xrvXvFrJ3DANBgkqhkiG9w0BAQUFAAOCAQEA
-oazABzdDThU4urpnGYY9HgjCR+/X/RHBuZ3mKbw/xT8BSZyOjFEHVy3VCeYq6cSg
-l9mvej26ZJQOtJ1CyM5S0yuH1/nNqDYf2d/0gSI1xki+pW8rvRmjc8n6ytD/Ogmm
-uYO2XZSSrtyn2nzzsK/ggB5EYhva39eYSjZs7A+I3Bqr02WAxvHHmiAFjbwqWXah
-8cyb0W0g2LGY3OxDnL6/WdPtf7SlkG0SlYIzyYuUxwVyxE6fmmbh3vtAz31HPSv6
-NKGLr/S1a0KWFVvdPW6eJygzGFRvNKySQMrK68iqT0WNhUCm96GTZK9UgD6M9eyv
-e5qdCpfQZSj3HagN3WLoqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.resultat.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
deleted file mode 100644
index a19a0648..00000000
--- a/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.uppfoljning.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.env.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.env.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Logo height="64" width="64">https://www.env.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.cvt.uppfoljning.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.cvt.uppfoljning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cvt.uppfoljning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJiQ6Y4LQA2rMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHd3dy5jdnQudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIyMTMyODM1
-WhcNMjUxMDE5MTMyODM1WjAnMSUwIwYDVQQDExx3d3cuY3Z0LnVwcGZvbGpuaW5n
-LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HEGTRbi
-gDbH0FVYPs6k4lKZ5MxM3nxAoSXcRDVizojNNzlsiy9VhqpUZyhJS3PWTd4ORII+
-PZxvApKOGMuIV4HElXfeX7YGm/v4KdXro2Sk5U5KVNzfg43Snb7oRS3pq9km2Uzr
-BmxiMwVxbzROnSfePal1wRyXqQwQJOXTLqLm9XBFC1Z3autwVLvn1YQ8t/c21QK8
-HeoxGGQAlf5IlsetiXNoJH714+ovpsbnlpZB9ZEU8gF+E2j/igGA1YxfcKNbusBi
-Ks6olO37lwb0kmULooqEwVIQRXfncOzx/O8QJI9FJWrHQlFmzFre6TAQ/iSVByb6
-rSPw0PXKNzyKYwIDAQABo3cwdTBUBgNVHREETTBLghx3d3cuY3Z0LnVwcGZvbGpu
-aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy5jdnQudXBwZm9sam5pbmcubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBRqHw1wOSeUjkz37X5oJtxCZwq3MDANBgkqhkiG
-9w0BAQUFAAOCAQEAVCyTPqAjAYrbO0t9nj/Vma1hbF2Y2rgBpjQDuSOIPuiFNjgw
-l6QVMhxbroL5FcWnYQ5eJAHGMgs7THDKvEs7lLo8hReyA/gyhtv+wnWw75Zdf7G3
-W5EKt6m0g4T0I6vLykleVx5iGcGGWWUKqBcqOEdEtVSnThPo6+qfGNa0+wAU+wYk
-dcRieDbdpuiP1i98Q6xHyHdufBFWypbxd7ay7/978uHhrMt06zgvBqcN0c6vDAEn
-JN8DBjzaLWDIVRmzVzcl/0rdt5hrTbdsWzWr06BNOXjapzJ+YlQ7efSLJDGlyeek
-Amc24v5TLThVrOsV13FA5SIl4sa5rwDvh3WoSw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml
deleted file mode 100644
index 55b0bd07..00000000
--- a/swamid-2.0/www.ete.grayzone.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ete.grayzone.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ete.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ete.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.ete.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.ete.grayzone.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ete.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ete.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOWFYTqhNVvCMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGXd3dy5ldGUuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTIxODQ0WhcN
-MjYwMzEyMTIxODQ0WjAkMSIwIAYDVQQDExl3d3cuZXRlLmdyYXl6b25lLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVBzGuFoS+tskR5h
-j5riw+TYtVOEoRzhhYadhWtDdHcVXzDhlCRjxUJh5ZaGMs2HQoU4fsuDOtc1FSx4
-5zfvXPlxrp1dAR6gIyzw/S3c7O++Y/eFcnEHeIp6Qj19ewe1IA0O01sGOKMFavjn
-HMSNqYr2jph0C/LxJxOz3aGzyJf7QdEzL9P6kqT3P5ZvmQwhTG5USlW/MBHvHkPl
-CEU3q7f5iJAgwCFrx2B+kcj/rqOgF09qoBPRx6P+UPpDZAwQ2GRZr4oTxugJD/7x
-EkSq/Ih+CuysSvj49kvuPtnyv3NzQtHr0v6OztvJGJrIvdYp5y9/8tOfZk67zze8
-+VXX9wIDAQABo3EwbzBOBgNVHREERzBFghl3d3cuZXRlLmdyYXl6b25lLmxhZG9r
-LnNlhihodHRwczovL3d3dy5ldGUuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBSLSbmYVzYDUUSx6oMPSF6CSX8TujANBgkqhkiG9w0BAQsFAAOCAQEA
-V1eergR3PJpB8MDSKi1yO4WWf3elAcpn/OcLc58hoem1dqnfc64sPVpRfKcfYSiR
-FAjTvJm1tSkXpYvKwMAPdfguBHODF1abm6BTTHBXnDG5Be8HvLf/apMKcWhBRwMh
-xLjcVBsD2JROhF8RpT6hs10RLPblWk2uyI79bBTgKdt9gfHaf9zk2SwDT26ll5WI
-CrdOV1fuoBg7Y7hejnuxzA/HS+B0l+Dxp19N4gKRZa2bp5X1CK7ZUGXW5sW6VhYW
-N2btwps3PZrInQGW94xgXB5upuxNEzoWLHhRdzGOaeO2Za3FefwH5Lkc7wD0Nez1
-xOLd3/SRsYXlsa7ueYeKiw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ete.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml
deleted file mode 100644
index f3e2aa08..00000000
--- a/swamid-2.0/www.grayzone.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.grayzone.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.grayzone.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAJgL/UIUo864MA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFXd3dy5ncmF5em9uZS5sYWRvay5zZTAeFw0xNjAzMTQxMTQ2MDhaFw0yNjAz
-MTIxMTQ2MDhaMCAxHjAcBgNVBAMTFXd3dy5ncmF5em9uZS5sYWRvay5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0c7tP+s8ifn2gZFh6FO6MIcFh7
-pwHh9ZnS1c+zdSLcI+VzUu8koV0o4JMKqr/o9hKMDkrd2EXRUiTux3+k0ePLWBMq
-6PnSjnCO4U/Pr0+ZKRfVI1KzDv7BPyv0lP5+AtS1UeLUe9SLiCsAsDyNcchDXDQE
-KOo9GiAsVUXFfedshhdN1iSXWetyL1aCdqZ4lYFzjYygnZ3Y+YEfKbcEAAnJVUD5
-joBuUJxCFyTB1oceCAJ2GXwRV+LNn/ZqYzfr4NLTcx3SEmxCLn+6L7xxY6P1+6j5
-xMMDN1VOy3i+ErYcoOeiqKadL3KKIY0jt9Cg9++x7zG3sd+j9Fudu/zWHFMCAwEA
-AaNpMGcwRgYDVR0RBD8wPYIVd3d3LmdyYXl6b25lLmxhZG9rLnNlhiRodHRwczov
-L3d3dy5ncmF5em9uZS5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFD9mG85cKreL
-30kUPNS51OTXyhm8MA0GCSqGSIb3DQEBCwUAA4IBAQAMopCEYdbeBSVMLnqjJpgv
-GaQY1SNtI20IHcfzDKJogzjv/4UVcUFUO0VCI1RFmD8E7DfEUD3EZuYoX6+QkdEA
-PpL4bkfkcE1yfH2y7TYkt/7nbXqNYg/Rpg6tUYceXyriBKpuZia61Bx3moNtIKCO
-18S4vOyjGvh9MTuGMM81eRP4ZO6cCPxIimd4jyK9F7cqh8reB1skvO9+ghiak5sg
-YXMU0kj/IDNQQ9Hr2tj8e88rT15DRmjRI3dCCdrQ3geW+ZZkMm+bPdV1vfHGvG8+
-0yEVh0F2lpMEqdwLpcmqO8+/usorbJxs69tTG93PVbL3Oe3LfjV0EXKnwQkmlbRA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml b/swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml
deleted file mode 100644
index 4907d16e..00000000
--- a/swamid-2.0/www.led.aitp.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.led.aitp.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.led.aitp.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.led.aitp.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.led.aitp.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.led.aitp.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.led.aitp.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.led.aitp.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMUfZRVa09jzMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
-BAMTFXd3dy5sZWQuYWl0cC5sYWRvay5zZTAeFw0xNjAzMjIxMTA4MDFaFw0yNjAz
-MjAxMTA4MDFaMCAxHjAcBgNVBAMTFXd3dy5sZWQuYWl0cC5sYWRvay5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtG+Q8i/hPsbBuTqfnOIp4S33oH
-bNRDy01jqfvbUFHhA+2lGTBRc/TGNOeLu5kns2pGWywJNPP47fgT2VaiDt6mXT9a
-naZ/aq+yz2vX60bbBK55ycj/5YSNrbU30dgaZf6DVDK3BA9VLd06op/QowTcpBFY
-OQ4BokuBDrNiGNmmzvC7zfS2ol8FI/9skBSxDOsdkcv77GhdWWlq1EyYmTCnz8JT
-37/gRBOM8g1iugZ058FooiImJWzfMtZ7IyilQXh8WJNoQm1sAjTljlxo6NxzIZxF
-6N0HTb0wejShNJkDcha5B+5UEZMSCKc53Q2XoWO1nG6OGDiq4sDQSbJQJC8CAwEA
-AaNpMGcwRgYDVR0RBD8wPYIVd3d3LmxlZC5haXRwLmxhZG9rLnNlhiRodHRwczov
-L3d3dy5sZWQuYWl0cC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFCYLPvWoJQWG
-JHUKjcUb2JR7e5IAMA0GCSqGSIb3DQEBCwUAA4IBAQCu37xA3486vgJwXj0ZDbB2
-BlODSSwfxmkugdf8IKrQQsk5zFrT0/Ez2MjPx6hsKAKYrWUTBGzdVgg6oACoF9yM
-6PZ9mV6XzWywBQyiGiKNEs+PpoHYg445EAoZpTqdAZTqPlXZzKsulFg6Er7zEWyJ
-ukUHPqvjMUAY+beToQjKgLL7oay8gGowEGydjGwhfWBtJNa0UaJTNAFgp2xwstr+
-gelT1txaGK/dEbOeftFEIdjdNq+hGCO0GencBeBoYWZUOoRzjP1QzKKAZr+Ye2Z+
-ki90GX1MA+hLqpfsqu2H1anHzoSwUXaJ0oc8vhnOnAv4Ib84PRvvYxfO3zJMNwDD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.led.aitp.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Hans</md:GivenName>
-    <md:SurName>Sandstén</md:SurName>
-    <md:EmailAddress>mailto:hans.sandsten@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
index 87722f59..187b5a47 100644
--- a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
@@ -6,16 +6,21 @@
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -24,8 +29,14 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit-ik.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.mit-ik.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT IK</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok www.mit-ik.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.mit-ik.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.mit-ik.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit-ik.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -34,26 +45,12 @@
         <ds:KeyName>www.mit-ik.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.mit-ik.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANL6yf7/ut6nMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3d3dy5taXQtaWsubGFkb2suc2UwHhcNMTMxMjA1MTEyMzE2WhcNMjMxMjAz
-MTEyMzE2WjAeMRwwGgYDVQQDExN3d3cubWl0LWlrLmxhZG9rLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n5D2gQ7nHF/GL8+pjQwVWDCltO4Zxim
-8aN+KsuQexMHhDhQqrOsNY3smAbqKjyA50sZgc+kG2+pm5nJ3BtAFUJxOqHSsBFN
-hkpEmSlhXvN8z6GBW3PJU3X++LAi2PP6Cc5U1uLuROHjdlqhazCDB8iAPxkK4U2J
-SmtqokM+rlFWSqag+cL/rQuySL5JVAH1Ez9WmYd5bZQaC2acUwojuBAE+RUtkH/d
-int0TKVxLRiYitHsqoPnPjkaf2i+xek2793pO/5D0PWDSDKv+2uMoWDGguwGuJga
-76H+nO33kAM3CEaCpks9didq/vCf+OkUW6jIx7zDLYAldRhY9uvZiQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghN3d3cubWl0LWlrLmxhZG9rLnNlhiJodHRwczovL3d3dy5t
-aXQtaWsubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR66X4ZBaD5XtilseE47n6e
-5rc6lDANBgkqhkiG9w0BAQUFAAOCAQEAka+wRN3C8Kv4SMDSjDhiIejGOZ4KZOXD
-LkUOt8AGlNTl7tzaQyznpuB4ojVemgAbnwAu2foUaERbqpD47XHzuBY7Ktmvd7ZN
-w5jZNJ5xf+W+WZ82dRhEvCtvn0acOC7bJhFAmhYQK5ZRQ3n87bxGB9WIGmUr1HKa
-Gw4/2Un4tYKbcbHpsVtrq/5ZOQRSbxcNKv+PZMCWVTvGI8Su7WQO2khvyDM8jfDK
-buip7GVO7Wnq60m3Ec56C5ZEokbcHqqy0phe/qJLj7gK0d78IN/gMJ0wGPRsUsgJ
-f7yN1uMpnUl12o/qmXNaqs7r1AOJ2CLfd+gRzYL9kS9FsLfKTrrwtg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJANL6yf7/ut6nMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3d3dy5taXQtaWsubGFkb2suc2UwHhcNMTMxMjA1MTEyMzE2WhcNMjMxMjAzMTEyMzE2WjAeMRwwGgYDVQQDExN3d3cubWl0LWlrLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n5D2gQ7nHF/GL8+pjQwVWDCltO4Zxim8aN+KsuQexMHhDhQqrOsNY3smAbqKjyA50sZgc+kG2+pm5nJ3BtAFUJxOqHSsBFNhkpEmSlhXvN8z6GBW3PJU3X++LAi2PP6Cc5U1uLuROHjdlqhazCDB8iAPxkK4U2JSmtqokM+rlFWSqag+cL/rQuySL5JVAH1Ez9WmYd5bZQaC2acUwojuBAE+RUtkH/dint0TKVxLRiYitHsqoPnPjkaf2i+xek2793pO/5D0PWDSDKv+2uMoWDGguwGuJga76H+nO33kAM3CEaCpks9didq/vCf+OkUW6jIx7zDLYAldRhY9uvZiQIDAQABo2UwYzBCBgNVHREEOzA5ghN3d3cubWl0LWlrLmxhZG9rLnNlhiJodHRwczovL3d3dy5taXQtaWsubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR66X4ZBaD5XtilseE47n6e5rc6lDANBgkqhkiG9w0BAQUFAAOCAQEAka+wRN3C8Kv4SMDSjDhiIejGOZ4KZOXDLkUOt8AGlNTl7tzaQyznpuB4ojVemgAbnwAu2foUaERbqpD47XHzuBY7Ktmvd7ZNw5jZNJ5xf+W+WZ82dRhEvCtvn0acOC7bJhFAmhYQK5ZRQ3n87bxGB9WIGmUr1HKaGw4/2Un4tYKbcbHpsVtrq/5ZOQRSbxcNKv+PZMCWVTvGI8Su7WQO2khvyDM8jfDKbuip7GVO7Wnq60m3Ec56C5ZEokbcHqqy0phe/qJLj7gK0d78IN/gMJ0wGPRsUsgJf7yN1uMpnUl12o/qmXNaqs7r1AOJ2CLfd+gRzYL9kS9FsLfKTrrwtg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
@@ -76,4 +73,22 @@ f7yN1uMpnUl12o/qmXNaqs7r1AOJ2CLfd+gRzYL9kS9FsLfKTrrwtg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit-ik.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit-ik.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
index 05319599..ec05287f 100644
--- a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mit-integration.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -30,16 +26,18 @@ and do *NOT* provide it in real time to your partners.
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.mit-integration.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.mit-integration.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.mit-integration.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.mit-integration.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit-integration.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -47,25 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.mit-integration.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.mit-integration.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAKYywn+rZRyTMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHd3dy5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UwHhcNMTYxMDExMTc1MDI5
-WhcNMjYxMDA5MTc1MDI5WjAnMSUwIwYDVQQDExx3d3cubWl0LWludGVncmF0aW9u
-LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVQjwYwG
-N579yQIvHQxGMlOOxzxGA29czwbT+Up9KVoPDyic4CCciNrL96H5JHPw+tw6zI0c
-ebqfEV1K2bjj7+1W0ihOF83R6rTBhwwDdjb+fVBOY0jF5sqoFKEqN7TFu3Sd4Zyg
-dyQ08+4Ak16xVPRXBZJeeSanBcUJ1yeHqD3YqUTW8O+sbaqsuXJfhGfpgFtgDGZP
-WLfW+op2CUG6Jx1Kx3L/+u8/+ttc/UYKYz6RTceXTCdALgDBkWqPZZ3gXGzt098W
-eBDqBClzCGmIJdt5YscHnWIbyOhbpJ8CgHEl6geS+cB3a+yhIWui74F9U3WYludL
-ipPlP7EwvhMU+QIDAQABo3cwdTBUBgNVHREETTBLghx3d3cubWl0LWludGVncmF0
-aW9uLmxhZG9rLnNlhitodHRwczovL3d3dy5taXQtaW50ZWdyYXRpb24ubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBSKBxUct3WQikcVNHQYcL8t4rQv6jANBgkqhkiG
-9w0BAQUFAAOCAQEAVNTRRloLA42UnVL1bXIQce+IJkl+SvcV0enWO20CKcMR4ucs
-CIgkt6CbOEOEohrpsdqAO/UH8oN7r+p79l11nDgIfo9gCciEmX0iMnnA3pzS0U5m
-ivqTiIBt0zGfuPZq2a3HaF6z/YNpHg1x7g+jrcyPyG03bvVsfFqONxL9wyHe5OyO
-jGYrJasbVF9mIknRJDORSKIIDAGruyIAb5r+ZI5Q2zCGMGKryinZpCeefIVIwf04
-52BF6+p9lCXJKCYhLJSnecP8o9QaSXCN1GXC9is/+MKXvg9doQ7XDl1Jb7foz3M7
-4NN5Fhg/q1cnxZX7EnIbiwu2oIOGSPGcnAPbHA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAKYywn+rZRyTMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNVBAMTHHd3dy5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UwHhcNMTYxMDExMTc1MDI5WhcNMjYxMDA5MTc1MDI5WjAnMSUwIwYDVQQDExx3d3cubWl0LWludGVncmF0aW9uLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzVQjwYwGN579yQIvHQxGMlOOxzxGA29czwbT+Up9KVoPDyic4CCciNrL96H5JHPw+tw6zI0cebqfEV1K2bjj7+1W0ihOF83R6rTBhwwDdjb+fVBOY0jF5sqoFKEqN7TFu3Sd4ZygdyQ08+4Ak16xVPRXBZJeeSanBcUJ1yeHqD3YqUTW8O+sbaqsuXJfhGfpgFtgDGZPWLfW+op2CUG6Jx1Kx3L/+u8/+ttc/UYKYz6RTceXTCdALgDBkWqPZZ3gXGzt098WeBDqBClzCGmIJdt5YscHnWIbyOhbpJ8CgHEl6geS+cB3a+yhIWui74F9U3WYludLipPlP7EwvhMU+QIDAQABo3cwdTBUBgNVHREETTBLghx3d3cubWl0LWludGVncmF0aW9uLmxhZG9rLnNlhitodHRwczovL3d3dy5taXQtaW50ZWdyYXRpb24ubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBSKBxUct3WQikcVNHQYcL8t4rQv6jANBgkqhkiG9w0BAQUFAAOCAQEAVNTRRloLA42UnVL1bXIQce+IJkl+SvcV0enWO20CKcMR4ucsCIgkt6CbOEOEohrpsdqAO/UH8oN7r+p79l11nDgIfo9gCciEmX0iMnnA3pzS0U5mivqTiIBt0zGfuPZq2a3HaF6z/YNpHg1x7g+jrcyPyG03bvVsfFqONxL9wyHe5OyOjGYrJasbVF9mIknRJDORSKIIDAGruyIAb5r+ZI5Q2zCGMGKryinZpCeefIVIwf0452BF6+p9lCXJKCYhLJSnecP8o9QaSXCN1GXC9is/+MKXvg9doQ7XDl1Jb7foz3M74NN5Fhg/q1cnxZX7EnIbiwu2oIOGSPGcnAPbHA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -93,4 +73,22 @@ jGYrJasbVF9mIknRJDORSKIIDAGruyIAb5r+ZI5Q2zCGMGKryinZpCeefIVIwf04
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit-integration.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index 4d633ec8..82229028 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
@@ -6,16 +6,21 @@
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -24,8 +29,14 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.mit.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.mit.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Ladok www.mit.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok www.mit.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.mit.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.mit.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -34,26 +45,12 @@
         <ds:KeyName>www.mit.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.mit.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANNcGylEJgt3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHd3dy5taXQubGFkb2suc2UwHhcNMTMwNDExMDcwMDQ3WhcNMjMwNDA5MDcw
-MDQ3WjAbMRkwFwYDVQQDExB3d3cubWl0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAswDSRA8IdF5WRRtQ9BPH2bscDtgLSzXAhk3JdshV
-BQN2zlrewF0FAulDEm7Lv4Ci1n9/mT0ITxvybvB0KD6WrS1ac0sWk8gXenT2Qs9l
-dgOJjRpF2lH2E5nK063xFauLngf1EGFiPxN7Gaiq58dk8NWchcfW3mHuN4gQZi1k
-UH6hBXuuaIyDWyigyUzEUsTVDFhcLeIfylDSoM4wcL0QuBqFYBb4MyF6XLBCcQLe
-A+ugJMNmn/I4AzIdXF3WuopCYp3UWwhwKSwN57vdHMvi3E/9tXVVKZS8q4bdV3vF
-NgfvBrwWW3Aoq2KRB9jXH2fV3uUsXA4Hfre3ZetxO6cW6wIDAQABo18wXTA8BgNV
-HREENTAzghB3d3cubWl0LmxhZG9rLnNlhh9odHRwczovL3d3dy5taXQubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBQCB2VdO4d6ZY49UjaP0Wfm92LyJjANBgkqhkiG
-9w0BAQUFAAOCAQEAGO6QVRj8GjZNg0Z7wTVSQQVlTQhqp4OZIqNKgAFQNDd6sXc4
-Xe8AtIwcE6U7afG1R1uC80XE2HumOL84GqExtz23aLDKenFxe6w/QVRKXgDqYDjE
-VABSgE00pa3zSaDlBu6GpmcXsSjVyB5x641Si9oxZf6rhvqW1Lu/Lp+0FmX1DWmK
-NZfFVjy4HWD10ZYih94AG1VYNvy9nb17V+8s64tLdjhMZYoDHoONPtxNIEal5uvQ
-vkwILAtVdnYhq7OrK0V41hm5A5BLnyDf/nJAJVEAt+FAn4TDZzMvqtO4x1r1gvPh
-hiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANNcGylEJgt3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEHd3dy5taXQubGFkb2suc2UwHhcNMTMwNDExMDcwMDQ3WhcNMjMwNDA5MDcwMDQ3WjAbMRkwFwYDVQQDExB3d3cubWl0LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAswDSRA8IdF5WRRtQ9BPH2bscDtgLSzXAhk3JdshVBQN2zlrewF0FAulDEm7Lv4Ci1n9/mT0ITxvybvB0KD6WrS1ac0sWk8gXenT2Qs9ldgOJjRpF2lH2E5nK063xFauLngf1EGFiPxN7Gaiq58dk8NWchcfW3mHuN4gQZi1kUH6hBXuuaIyDWyigyUzEUsTVDFhcLeIfylDSoM4wcL0QuBqFYBb4MyF6XLBCcQLeA+ugJMNmn/I4AzIdXF3WuopCYp3UWwhwKSwN57vdHMvi3E/9tXVVKZS8q4bdV3vFNgfvBrwWW3Aoq2KRB9jXH2fV3uUsXA4Hfre3ZetxO6cW6wIDAQABo18wXTA8BgNVHREENTAzghB3d3cubWl0LmxhZG9rLnNlhh9odHRwczovL3d3dy5taXQubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBQCB2VdO4d6ZY49UjaP0Wfm92LyJjANBgkqhkiG9w0BAQUFAAOCAQEAGO6QVRj8GjZNg0Z7wTVSQQVlTQhqp4OZIqNKgAFQNDd6sXc4Xe8AtIwcE6U7afG1R1uC80XE2HumOL84GqExtz23aLDKenFxe6w/QVRKXgDqYDjEVABSgE00pa3zSaDlBu6GpmcXsSjVyB5x641Si9oxZf6rhvqW1Lu/Lp+0FmX1DWmKNZfFVjy4HWD10ZYih94AG1VYNvy9nb17V+8s64tLdjhMZYoDHoONPtxNIEal5uvQvkwILAtVdnYhq7OrK0V41hm5A5BLnyDf/nJAJVEAt+FAn4TDZzMvqtO4x1r1gvPhhiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
@@ -71,10 +68,27 @@ hiXdvSpPHS4gwfMsYQ0SMmpyUlBMG0J8lN57vA==
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/POST"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <!--<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>-->
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml
deleted file mode 100644
index 0492df8e..00000000
--- a/swamid-2.0/www.nvt.ar.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nvt.ar.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.nvt.ar.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.nvt.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.nvt.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.nvt.ar.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.nvt.ar.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.nvt.ar.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALCnTLXPBNhAMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3d3dy5udnQuYXIubGFkb2suc2UwHhcNMTUwMzA2MTE1NDA5WhcNMjUwMzAz
-MTE1NDA5WjAeMRwwGgYDVQQDExN3d3cubnZ0LmFyLmxhZG9rLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Q2Ye1QrDRI1u0GJhrLG0j8i6tapcRiJ
-nBALGpG8dXh04apN8WJ1mTLGeW0VHvgYeardInfzXxheZTh89nFE9wADDxPxkmF9
-ZHvCkiGMOM1wejcIupyT/InZ8OIrh9mcuuK1MjJ0W5awOiBi+c+ibZwDhCtutzE/
-RIbWbNIXsLu8tl0dTXn+npDaa4PuYlfBHnrEKitA/B2y72JfSZqtn4JUdPa2ZoY4
-90g4UiZAJLB+U/uqigR9YdneCTA4caQAreIfwG50HVs4gYw9upn7pqkcLxafOUtq
-eYwI6hgK5ovvfSy5j0LGZ3jxuetH7Mpv8+BQgb4oaXpiNvkRm9SpZQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghN3d3cubnZ0LmFyLmxhZG9rLnNlhiJodHRwczovL3d3dy5u
-dnQuYXIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBQ9SlTHCjEmb88tAkrYc0Qd
-UyMntDANBgkqhkiG9w0BAQUFAAOCAQEA5yJcv3VDqI2NAxCRjUUw0zXZvaJoXbYf
-aGcw+v9JoLQRXZFdR5FQ6e3Fl21BMFMbzVNHkcAaLJN2pL9qMf7QUcOd3CyuUKgd
-Jnd4HTYWJTjXB4J5B3cXZrfHd8pXuA6cM+McpTnF9lvBmxgRb/H9NF8rqkbHgD8c
-W3tputjUxL+Vnw9R+znIPD526wQaloaTGoejqfgl9EA0kVxOMObER6yQ0sj9xsl5
-lysGQwo1+xp0n4fB3zmXRPTUwnw6qxS81mVpW0uQFb0pxUeLcbf5PwKvL0vVGzJT
-JRxZMVwXFUuyy6QeZ//MHqoNR07si2v6641PxjQHTNTpskU/bJ4jAA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nvt.ar.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.nvt.resultat.ladok.se-gui-sp.xml b/swamid-2.0/www.nvt.resultat.ladok.se-gui-sp.xml
deleted file mode 100644
index 09b6f0ed..00000000
--- a/swamid-2.0/www.nvt.resultat.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nvt.resultat.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.nvt.resultat.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.nvt.resultat.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstod för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.nvt.resultat.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.nvt.resultat.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.nvt.resultat.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.nvt.resultat.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOBmjGBKkXmJMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy5udnQucmVzdWx0YXQubGFkb2suc2UwHhcNMTUwNTI2MTEyNDQ4WhcN
-MjUwNTIzMTEyNDQ4WjAkMSIwIAYDVQQDExl3d3cubnZ0LnJlc3VsdGF0LmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXGFrAEbujHONith
-sv099ChkLXB5Z4JxVLdI85QuNFg+gB3Ts+uVYArd70POCEAk1pHQW0FImuC+vjBb
-U3yHNCuoa/+eZj4rS/KxdAkMKiyG3JpjcSEN3XnyUnFCUvY0j3sUlvn/s1mzUH2l
-P2pWAL6jufF5heRuJ8P13L2qErvgEYpfdx4tq7sHaLNip7eV76+PKuFQRcbbqcJG
-zJe8C1q5AEZnMriKaunsQZafBbjNkBzo/465dzj9HzcrLdMTSyCSEvfxVs+4xLdu
-qC0EAgRFZkp+G1li8TNb+c/RqFpKQlV0exC9iqa70oLB9w0ILQHP66arcZ2ssp8X
-8qPD8wIDAQABo3EwbzBOBgNVHREERzBFghl3d3cubnZ0LnJlc3VsdGF0LmxhZG9r
-LnNlhihodHRwczovL3d3dy5udnQucmVzdWx0YXQubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBRxB1TSvrBmJ6MkVkL8f+tdJDt5BjANBgkqhkiG9w0BAQUFAAOCAQEA
-TrF0gNXSuKBVwhviRdC8oidwFawFVjutQIUVI7Djhr0pccurVJ8RaGsG5eFo9FN6
-jP8/MFzDA7OH1CLnuzkY7tgCg8aZ2VrvzAIX04xRtou4RkKaxTvFCk7tLiFl5ZqF
-7zILdc9qpOYVUV4cBH+rTT2MjV5HDaW4H2ESVnUKnYjxnylifR/lSRJpxSrrdJYY
-CoNyDjHVtvFxodx6VJOAjQHCC5f+bANAi9rRD0R3SFnwq5cMJapCjWwGAhgmNsgv
-N69OreDS1oYSb4phj9p+O9ujTbaiVoCzG3xZHLS18ND8/pt6JQfVoGEhqj/JfVtK
-JD1lKrYfwjzdJZKXxLSpeQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nvt.resultat.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.rva.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.rva.ar.ladok.se-gui-sp.xml
deleted file mode 100644
index c5b54882..00000000
--- a/swamid-2.0/www.rva.ar.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rva.ar.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.rva.ar.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.rva.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.rva.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.rva.ar.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.rva.ar.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.rva.ar.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJIr0U/MQN78MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3d3dy5ydmEuYXIubGFkb2suc2UwHhcNMTUwMzExMTMxMzEwWhcNMjUwMzA4
-MTMxMzEwWjAeMRwwGgYDVQQDExN3d3cucnZhLmFyLmxhZG9rLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAytR6BGgkGEtgmXxx7uz+nYH/j80wurdZ
-u8/61pinsFz6m2wNmyVgosqtmXO/ohZjhOBY7U7rAlDyproNTc7mgIPPr0IKoHSV
-OxHxQ3zrjg+uME9qKQFuAc3R6XkN6ChtPYTTaZAdF8MJYP/7qOFrucaeth2ZDGXH
-isHFwJ/sfeM1m218ULVqM9VMi3Ray8Du8x66k8TU2NEw3H/ZKMsbVvmT5YkJ2Pf4
-q7/0trLZkQWB1+1th1Jvpo8Mg/dN9/xz7U+dCxjVnZKGcrG5rIr+glV0AmcYMoSF
-xcQNHP3HIzhq2gNzJObJSBeCj/sQlX7pG+xyQLsox0kxAB/uUxxoBwIDAQABo2Uw
-YzBCBgNVHREEOzA5ghN3d3cucnZhLmFyLmxhZG9rLnNlhiJodHRwczovL3d3dy5y
-dmEuYXIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBQApfQjdtUWLQ8Nmt63z4Q4
-sJnu0TANBgkqhkiG9w0BAQUFAAOCAQEAbw+HYfL/EwKyIwXmuolH7nrXM1fewAPQ
-kl/hx8sdL+EO1UGcSXKNtLPfwjQ0PUkl4XohUeSeVETPhrt9tZFKOMSDHDpklDoS
-Tu6axvlJ0JQyr8DYpskTd9R1ZEtT+hEenA5O7NR3WkTIPxfZVxPeNkBrdcoQmxHy
-4+lfU6QOZpVW0q058Kcp/uQBWZ89S8kR4OK6sLNNkOweTyAMRCuuk3vUWFHGVXh7
-0mE6kKIoI9JhvnzrFPTGqEx4p3f/AppCTKoEdIVFkHar1DPBJDiXHgSEDwXv3fuT
-PKmLjRJGNEV+OLIHc1VJRz2wkF76UJgdbH91DqdttDwGTuiaU4XAsQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rva.ar.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.start.ladok.se-gui-sp.xml b/swamid-2.0/www.start.ladok.se-gui-sp.xml
index 7a73d223..085297c6 100644
--- a/swamid-2.0/www.start.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.start.ladok.se-gui-sp.xml
@@ -31,10 +31,12 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.start.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.start.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.start.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -43,24 +45,7 @@
         <ds:KeyName>www.start.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.start.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDIDCCAgigAwIBAgIJAJ9ZObDxOs3/MA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMTEnd3dy5zdGFydC5sYWRvay5zZTAeFw0xNjA0MjUxMDA1NTRaFw0yNjA0MjMx
-MDA1NTRaMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJoQ9FWIadS9qwygHOArRhD2zsKwK8AvOn00
-tZDk2atdpYO+ZZNnd2GjmdZg1ZLchfr3odvGDHzAtmuob3eTdWr+FSVkN2gs4zsq
-cYXOcyuHeO++xxuW7p0RVDG4Yoh/losV/Gc/DWHVtzlih85UWx1JUwk3r+5sprB2
-GxJEyR+0K8OA0pKnO4HY+I229g4b+gDVeiZT2mgpRdv5ZiKkSCCXDfktTxCzBr5r
-EORpjcQeGphJmkS2NrwAhz7LD8jmZCSn8C1HndhB6+syAh9uckcVgwo9TXqznTu9
-xx1He23MjYsZo79u7DuoMiDXY+8A7v4/CQ9DdFqcqfDfW7VcEi0CAwEAAaNjMGEw
-QAYDVR0RBDkwN4ISd3d3LnN0YXJ0LmxhZG9rLnNlhiFodHRwczovL3d3dy5zdGFy
-dC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFBTI2HIkkPdufvJjk7xyMM1ElUR3
-MA0GCSqGSIb3DQEBCwUAA4IBAQBiG3egtaHpHUefSZwdZtKe6TMV0WCDjHLVaBtG
-N8VYTJgkVwb3dU4nU5J1BnK4nRAEvxoOPRjy6QVvWuVhfWWa2wUJO2W+qbefu4UN
-FoB/q4SUYuzlMzZBcSheN/Xp1GtyfLY/0htNuL+V5dqCXqpDUDL+w/p920OUohQv
-StSkBn05CcRrrj+u9OvSDjEka1eMhx3QjRHyMQ4pytf/d5Z16aLE1Y5ow0IXKQ4/
-j63DbELE2yMbs7iEBCtgHuu/KlG8qhCWwhlP7QNHFhv3D0wKwREAtnOrDsuNVwKd
-afKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDIDCCAgigAwIBAgIJAJ9ZObDxOs3/MA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTAeFw0xNjA0MjUxMDA1NTRaFw0yNjA0MjMxMDA1NTRaMB0xGzAZBgNVBAMTEnd3dy5zdGFydC5sYWRvay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJoQ9FWIadS9qwygHOArRhD2zsKwK8AvOn00tZDk2atdpYO+ZZNnd2GjmdZg1ZLchfr3odvGDHzAtmuob3eTdWr+FSVkN2gs4zsqcYXOcyuHeO++xxuW7p0RVDG4Yoh/losV/Gc/DWHVtzlih85UWx1JUwk3r+5sprB2GxJEyR+0K8OA0pKnO4HY+I229g4b+gDVeiZT2mgpRdv5ZiKkSCCXDfktTxCzBr5rEORpjcQeGphJmkS2NrwAhz7LD8jmZCSn8C1HndhB6+syAh9uckcVgwo9TXqznTu9xx1He23MjYsZo79u7DuoMiDXY+8A7v4/CQ9DdFqcqfDfW7VcEi0CAwEAAaNjMGEwQAYDVR0RBDkwN4ISd3d3LnN0YXJ0LmxhZG9rLnNlhiFodHRwczovL3d3dy5zdGFydC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFBTI2HIkkPdufvJjk7xyMM1ElUR3MA0GCSqGSIb3DQEBCwUAA4IBAQBiG3egtaHpHUefSZwdZtKe6TMV0WCDjHLVaBtGN8VYTJgkVwb3dU4nU5J1BnK4nRAEvxoOPRjy6QVvWuVhfWWa2wUJO2W+qbefu4UNFoB/q4SUYuzlMzZBcSheN/Xp1GtyfLY/0htNuL+V5dqCXqpDUDL+w/p920OUohQvStSkBn05CcRrrj+u9OvSDjEka1eMhx3QjRHyMQ4pytf/d5Z16aLE1Y5ow0IXKQ4/j63DbELE2yMbs7iEBCtgHuu/KlG8qhCWwhlP7QNHFhv3D0wKwREAtnOrDsuNVwKdafKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -88,4 +73,22 @@ afKPx82ANlnCVaJVclgEH/S2/fMYv1ZvrsvqK0siDLr5EEpH
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index e29bf709..ca1ad6be 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -30,12 +30,14 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.student.ladok.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.student.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.student.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.student.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt www.student.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok student web www.student.ladok.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.student.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,24 +46,7 @@
         <ds:KeyName>www.student.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.student.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAOCnVBGvbu36MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHd3dy5zdHVkZW50LmxhZG9rLnNlMB4XDTE2MDQyNTExMjczMloXDTI2MDQy
-MzExMjczMlowHzEdMBsGA1UEAxMUd3d3LnN0dWRlbnQubGFkb2suc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHGKGOBwvvrybht4ptf12h7SjSW4WQ
-V7FdfyLJxAtoVH++3XgnsS88BhYNaOWYysUL2q+YH5qdq8ZfOrw0//VaHz2LEqqW
-LloG1sADvw1GyN+YZLmTOayhxpMp2MHxxM9tynhoyYeFF3GEvME9zJxkcmBN0oe0
-P+QLicuYnJNU8wDzpiV+k70DZttRTDp7z+ewVMaOPcrhkItiEzdDD0NE5YGo1kIg
-n8ZC7SdhWcIvgM/POeWM74VPmsTlN3Muf7+7T80EzhfbexANf4srflZLN7VS+Os4
-JWsbTh8qycOFu0M4llmOBgdC2BYKDoNXZGDCYE5ImWkjcn2pBMlsvp5HAgMBAAGj
-ZzBlMEQGA1UdEQQ9MDuCFHd3dy5zdHVkZW50LmxhZG9rLnNlhiNodHRwczovL3d3
-dy5zdHVkZW50LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUxMCnw4eJUufZfek3
-vLBmzfWrcw0wDQYJKoZIhvcNAQELBQADggEBADl0sb5+Ct83vuwR8m6DtxAy+QfG
-VJQsSHVzQw6n9XeWx5pREWNEDMUcZZ4/On+bi7KdY2WpDqgNJSTlSKKZ5b4vbQ4P
-0v0hyeHIvHYW+3QnQPta+oMf0lCi2+GTupVihw9NvwZgK0PjhXyG3ci5aWBWjd3a
-QvnJKt3hDgOf4Fvtih8OXhl89hyb6VsXA5v2wZk9M4QOoIraNOxnNH0ntqa/dSjU
-ixZQm1zM5PRAweCt9rLUgTrAwbfSykzaeHiRm5j4zJn/3frVs/b2ZyBNvVkujS1H
-xz4HZx54okaK76e3jPW6Hw8lPm8WEg05QDIkgjEKpQCY9hDXukP8NnV685Q=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJAOCnVBGvbu36MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNVBAMTFHd3dy5zdHVkZW50LmxhZG9rLnNlMB4XDTE2MDQyNTExMjczMloXDTI2MDQyMzExMjczMlowHzEdMBsGA1UEAxMUd3d3LnN0dWRlbnQubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHGKGOBwvvrybht4ptf12h7SjSW4WQV7FdfyLJxAtoVH++3XgnsS88BhYNaOWYysUL2q+YH5qdq8ZfOrw0//VaHz2LEqqWLloG1sADvw1GyN+YZLmTOayhxpMp2MHxxM9tynhoyYeFF3GEvME9zJxkcmBN0oe0P+QLicuYnJNU8wDzpiV+k70DZttRTDp7z+ewVMaOPcrhkItiEzdDD0NE5YGo1kIgn8ZC7SdhWcIvgM/POeWM74VPmsTlN3Muf7+7T80EzhfbexANf4srflZLN7VS+Os4JWsbTh8qycOFu0M4llmOBgdC2BYKDoNXZGDCYE5ImWkjcn2pBMlsvp5HAgMBAAGjZzBlMEQGA1UdEQQ9MDuCFHd3dy5zdHVkZW50LmxhZG9rLnNlhiNodHRwczovL3d3dy5zdHVkZW50LmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUxMCnw4eJUufZfek3vLBmzfWrcw0wDQYJKoZIhvcNAQELBQADggEBADl0sb5+Ct83vuwR8m6DtxAy+QfGVJQsSHVzQw6n9XeWx5pREWNEDMUcZZ4/On+bi7KdY2WpDqgNJSTlSKKZ5b4vbQ4P0v0hyeHIvHYW+3QnQPta+oMf0lCi2+GTupVihw9NvwZgK0PjhXyG3ci5aWBWjd3aQvnJKt3hDgOf4Fvtih8OXhl89hyb6VsXA5v2wZk9M4QOoIraNOxnNH0ntqa/dSjUixZQm1zM5PRAweCt9rLUgTrAwbfSykzaeHiRm5j4zJn/3frVs/b2ZyBNvVkujS1Hxz4HZx54okaK76e3jPW6Hw8lPm8WEg05QDIkgjEKpQCY9hDXukP8NnV685Q=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -89,4 +74,22 @@ xz4HZx54okaK76e3jPW6Hw8lPm8WEg05QDIkgjEKpQCY9hDXukP8NnV685Q=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.tce.ar.ladok.se-gui-sp.xml b/swamid-2.0/www.tce.ar.ladok.se-gui-sp.xml
deleted file mode 100644
index e8f15606..00000000
--- a/swamid-2.0/www.tce.ar.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tce.ar.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.tce.ar.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.tce.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.tce.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.tce.ar.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.tce.ar.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.tce.ar.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAKijRK1R7GS+MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3d3dy50Y2UuYXIubGFkb2suc2UwHhcNMTUwMzIzMTQ0NzMzWhcNMjUwMzIw
-MTQ0NzMzWjAeMRwwGgYDVQQDExN3d3cudGNlLmFyLmxhZG9rLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvVpy5ngZYaMpRy+sy1amoEfCRKst5cBh
-Tci5tPNvZ/DDOhrcIWPmKG9R28eKLizYOHRmnH76bqY3d+BmnSgc78g/ILoyC0+8
-M0qnQh+209fGQRNB5ecvP7EA3D/FbnrCnZAbuUBwn6tTgCjSiO89TGjBRnyTEPK+
-uCUXtX2lrtqKgYDL+SKjUq1u9i4CXDh1sjBzr897mlGADK4wfatKCXJ8nnT/t9fT
-lfBcLY0ZKvDL0F9fU2wpQ7SzfKu1Gm+Ql4TdLcqLFMX50RgQrr4FUVjnhgJoREvm
-9jwsDorfvdD16vN79hVgky3/FZvaWDaUOQydustLHSupSRk6jw26iQIDAQABo2Uw
-YzBCBgNVHREEOzA5ghN3d3cudGNlLmFyLmxhZG9rLnNlhiJodHRwczovL3d3dy50
-Y2UuYXIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBRMGFL5pn7W1LnuRFIcdFhD
-J2a97DANBgkqhkiG9w0BAQUFAAOCAQEAooK8saDzzSUkkaWX+3RcQTsciJMmdFTo
-oeQT84gN/iStJ43Hgw7MUUMJ+WV4SqJ08pBE6xiDv0k1gybJGIKUzVw7TeHElQP1
-ZLz4bhyxHzidhrk4Ua0MWjbupYB15IxaJmGHvs+eFKYy9mhBP8LSjRReqaFTi7Hh
-vBLPrtM7P8GWZqe0jIpgoZhe0jkM5F1otZdHJqeB7xk/PFdWwbELYjbdhXmXlTVt
-mZS33NdlAK9V0/FNPnNIc6Kp8tNsw1a6dDhhY7qJ2guy8p0pkl9MNou+kPU1oiGR
-YFNEqHost6AnCf4RHHlu4PsSB7fG3M/oXgj9z2rUfqRGrFbUIfJOkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tce.ar.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.test.grayzone.ladok.se-gui-sp.xml
deleted file mode 100644
index 05d79d3e..00000000
--- a/swamid-2.0/www.test.grayzone.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.test.grayzone.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.test.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.test.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.test.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.test.grayzone.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.test.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.test.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAMP0BTvafynIMA0GCSqGSIb3DQEBCwUAMCUxIzAhBgNV
-BAMTGnd3dy50ZXN0LmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDMxNDA4NTMyMloX
-DTI2MDMxMjA4NTMyMlowJTEjMCEGA1UEAxMad3d3LnRlc3QuZ3JheXpvbmUubGFk
-b2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT4AnqNkQ9YTwA
-uJQ1J+xHn/XkyKOGrnnvr3ELgMZNC9FCbb4T6WwsUMJbxdICG8SY+l9+VS7yhEXz
-ZS252ilRyEDf5B9/gjvUosaNvoi2zPyXJWKsEXEj9dqTqOqpYBgVs15bOoh2NdVI
-uocLPJLzy3ot2gBG/sfH91mNeryQ6KxoMlEemZEe8ITh5wJFvTuukrzo08P1QbP0
-40AH6EzSyfZLIfyht75TNmJXQHVK8ECl9EtzAARJhH8JTw2BhYFEtnm6WiVLfStN
-shnKJXLoOaJxNK1cU0DOdOMnDtuO04CN0edU+lQmXlIJEveTP4qS1TldHvELZJ/R
-8zw9Dce/AgMBAAGjczBxMFAGA1UdEQRJMEeCGnd3dy50ZXN0LmdyYXl6b25lLmxh
-ZG9rLnNlhilodHRwczovL3d3dy50ZXN0LmdyYXl6b25lLmxhZG9rLnNlL2d1aS1z
-cDAdBgNVHQ4EFgQUzi69O/vgiRvYYrKqVi5cPDNYR7AwDQYJKoZIhvcNAQELBQAD
-ggEBADskNl+vv7YpipCp40BgN166XnBcfTilZvaN8yZ0XPARWTx1v84n4qERUw+s
-L3swnWDKTQ0bx8pn8LFVcgDX56onTNBMRzqNmJ0Bv1tgo8bVXk9Q0qPz/ANrx5TP
-RDeU+wX6TCxr2d0ggvqwaWQKQKK2y7Z9ij4ccimPSvdZBqRiGPjVaGKCB4hzotdZ
-Fyb7Q2VzAorfD08QY9JIvT5Tv8P2xDxZHK/2l/QX/bDqUT+jY5wzW0ksFghkkPZD
-DD5IhrCh9D0g84j5WdUrRQS4/aT4nXGsSVLHkmAfsw0K23BDmU2hjhSqsoiyA470
-75H9o1PKSvHR9qX0uJ8HbrBxU54=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.ladok.se-gui-sp.xml b/swamid-2.0/www.test.ladok.se-gui-sp.xml
index 04c29c1c..28291213 100644
--- a/swamid-2.0/www.test.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.test.ladok.se-gui-sp.xml
@@ -31,10 +31,12 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.test.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.test.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.test.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.test.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.test.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -43,35 +45,7 @@
         <ds:KeyName>www.test.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.test.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFHDCCAwSgAwIBAgIJAIbDYkZWg5D9MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXd3dy50ZXN0LmxhZG9rLnNlMB4XDTE2MDIxMDEzMzUzNloXDTI2MDIwNzEz
-MzUzNlowHDEaMBgGA1UEAxMRd3d3LnRlc3QubGFkb2suc2UwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQC+W5Gi4u6RApYh068l1O/jZB1LKHMYfBa7BeR1
-nGjZXTI15BhJJDeaIqiIyZCwmPiki66Ma5frzSERCki1u7rfP38/bddLtvCCpYhP
-xmQhOFWXQ3SXaWQETSZ3mVLnZmUk7rrnANnfKFLst0AGAAZGJ1M2CTT9yLXhzm4v
-/klsaoVjpOmfpmNlMV+wWj35fpm2Ni8XL1aSQnz0Q6/vUtbP+zbRUwMpXFC/8NO/
-+JT5HMOq6fAJpVJvozwOcPQ83ZaZRYYk2dcOPWgEG5Y4ooEnGdLNfiKQ6DyaMEev
-KGfaLdapWntSi4aeQoqDnGU13nbaRAMvOs389phEHQDpq28qGL3Njwgdg+yLGzJj
-9jUlkYkz7CvR+GQLsZqOeudX/3P1EhavPpk1aG7bGhUUhuLI67m0I5u6axXZi7UQ
-HKqOL4zjNvz1YpL4fel/47WcteYHarumJmuBpmvCqJAfjn9hZMqOkCLbY3NW/qai
-TRznyxNiK+bYZ0VfUcDCvsac0+NcU9a42j5fo1a2Y9q/7MMq76TJ3176t+rYWqJi
-199jmKfyffcrriV4HXkYwYywDyWAn+imSuso+PW7SNDxFu7gY7pPgU2Dnov31lq8
-zJVpN3ssOEWaAJcbPcS4Ho/9o2kL6Hpp42yhNn0ZCnTeOQKpariM8BRN/12v9zXD
-aoPC6QIDAQABo2EwXzA+BgNVHREENzA1ghF3d3cudGVzdC5sYWRvay5zZYYgaHR0
-cHM6Ly93d3cudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFHtJ6TbmFAeA
-4BaaLUhwxUHgEszoMA0GCSqGSIb3DQEBCwUAA4ICAQCnQhO2mDJe2HGQzC0Hts9r
-CxgSUQSR23e8FbXWFBniYByYPc786HJsoeDI3YvEO00rOSIRX45Mya5Iapbnj4F3
-f/ya6agLSjMk6ce9u+kqIeXii3JvFcV/biDdHSEdVgOEr39YMWP5tyaJhmesZLfy
-1SnJzlW3PrvFdgaKIfVJ2lfukx3OESJ10/CgRllf91eKpfTPB2g8vU0RAUq+odkk
-X7tSbGDpRtOYfym6FXZpdh2ZBft1QJV7E7jMJZ1dWx7gvp7w06JJozaXaiyIPKCl
-EIYvEppBO+Hs7IbDS4kUSKdzF14wof7qpzQQ+yULmOkrfC80MHGXkKaYNB+mzQ2C
-Am+tmUDwu+6JNeNDlrN72AlojvsDObgsCHoQIVsSx2wFYDM2zTvA/MR71KHASEi8
-eGdXcOgn3UMS/ehYrnDq0m/bAjsn/AHjGjIqsFQUpzwqG3N2djGtOD2dzcxOOKCL
-31aHDlUTgv1hdCpa5+NiIzRrahJoJrfmli/NBlX5wQbQ0s1UVlbgy5Xw0Ttr4IIy
-LDCJR8LVHDuZcx5GKkrwQE6fWwLJM8JI8JZF0w9j8bsrU3WUfCwfMaCKvwFlYgQQ
-Y6TwKaxgtHgm3WFnPMMTXkKWeKq3sp5fajwzptV1MA/uS2aOuboQ7qm6J2aFy0yX
-QOr7nPNnNq2e/M/T2ugEMg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFHDCCAwSgAwIBAgIJAIbDYkZWg5D9MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy50ZXN0LmxhZG9rLnNlMB4XDTE2MDIxMDEzMzUzNloXDTI2MDIwNzEzMzUzNlowHDEaMBgGA1UEAxMRd3d3LnRlc3QubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+W5Gi4u6RApYh068l1O/jZB1LKHMYfBa7BeR1nGjZXTI15BhJJDeaIqiIyZCwmPiki66Ma5frzSERCki1u7rfP38/bddLtvCCpYhPxmQhOFWXQ3SXaWQETSZ3mVLnZmUk7rrnANnfKFLst0AGAAZGJ1M2CTT9yLXhzm4v/klsaoVjpOmfpmNlMV+wWj35fpm2Ni8XL1aSQnz0Q6/vUtbP+zbRUwMpXFC/8NO/+JT5HMOq6fAJpVJvozwOcPQ83ZaZRYYk2dcOPWgEG5Y4ooEnGdLNfiKQ6DyaMEevKGfaLdapWntSi4aeQoqDnGU13nbaRAMvOs389phEHQDpq28qGL3Njwgdg+yLGzJj9jUlkYkz7CvR+GQLsZqOeudX/3P1EhavPpk1aG7bGhUUhuLI67m0I5u6axXZi7UQHKqOL4zjNvz1YpL4fel/47WcteYHarumJmuBpmvCqJAfjn9hZMqOkCLbY3NW/qaiTRznyxNiK+bYZ0VfUcDCvsac0+NcU9a42j5fo1a2Y9q/7MMq76TJ3176t+rYWqJi199jmKfyffcrriV4HXkYwYywDyWAn+imSuso+PW7SNDxFu7gY7pPgU2Dnov31lq8zJVpN3ssOEWaAJcbPcS4Ho/9o2kL6Hpp42yhNn0ZCnTeOQKpariM8BRN/12v9zXDaoPC6QIDAQABo2EwXzA+BgNVHREENzA1ghF3d3cudGVzdC5sYWRvay5zZYYgaHR0cHM6Ly93d3cudGVzdC5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFHtJ6TbmFAeA4BaaLUhwxUHgEszoMA0GCSqGSIb3DQEBCwUAA4ICAQCnQhO2mDJe2HGQzC0Hts9rCxgSUQSR23e8FbXWFBniYByYPc786HJsoeDI3YvEO00rOSIRX45Mya5Iapbnj4F3f/ya6agLSjMk6ce9u+kqIeXii3JvFcV/biDdHSEdVgOEr39YMWP5tyaJhmesZLfy1SnJzlW3PrvFdgaKIfVJ2lfukx3OESJ10/CgRllf91eKpfTPB2g8vU0RAUq+odkkX7tSbGDpRtOYfym6FXZpdh2ZBft1QJV7E7jMJZ1dWx7gvp7w06JJozaXaiyIPKClEIYvEppBO+Hs7IbDS4kUSKdzF14wof7qpzQQ+yULmOkrfC80MHGXkKaYNB+mzQ2CAm+tmUDwu+6JNeNDlrN72AlojvsDObgsCHoQIVsSx2wFYDM2zTvA/MR71KHASEi8eGdXcOgn3UMS/ehYrnDq0m/bAjsn/AHjGjIqsFQUpzwqG3N2djGtOD2dzcxOOKCL31aHDlUTgv1hdCpa5+NiIzRrahJoJrfmli/NBlX5wQbQ0s1UVlbgy5Xw0Ttr4IIyLDCJR8LVHDuZcx5GKkrwQE6fWwLJM8JI8JZF0w9j8bsrU3WUfCwfMaCKvwFlYgQQY6TwKaxgtHgm3WFnPMMTXkKWeKq3sp5fajwzptV1MA/uS2aOuboQ7qm6J2aFy0yXQOr7nPNnNq2e/M/T2ugEMg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -99,4 +73,22 @@ QOr7nPNnNq2e/M/T2ugEMg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml
deleted file mode 100644
index c9c75530..00000000
--- a/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.test.uppfoljning.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.test.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.test.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.test.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.test.uppfoljning.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.test.uppfoljning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.test.uppfoljning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTDCCAzSgAwIBAgIJAJwQ1AOzvzh4MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXd3dy50ZXN0LnVwcGZvbGpuaW5nLmxhZG9rLnNlMB4XDTE2MDExMzA5MzYy
-M1oXDTI2MDExMDA5MzYyM1owKDEmMCQGA1UEAxMdd3d3LnRlc3QudXBwZm9sam5p
-bmcubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQClXTeW
-/wJJQsTLzSeJ753U+8cwpv7FOwkUpCcHH6bb7nVIdcJDuYQOw8JVBl9S69cEXXcG
-+VevlFNf4qU9bKEGQKnd15YiybR5sus4x25dG4aGk7p6ZapsDoSg/CKwrbhmOjYT
-OCCjHUrsUdBEe0spS4qBGo5QVgMBMBWEhL85pxFxO95j80iU7LSQIKZSMWBZzm37
-ouSxsXT/x52Ao6HtlWK17BF0m9kW3uLW38wlaP7JTWTnve1CMaOMVEbDliw3ysX7
-uO6fKvTWTkpzG62offlKKExCbyH340X5TI8dOhyYOlFyrpccdSCQkcSviSJ4oL0j
-XAO+rCV1PngoecLThIidN8sSqIwL5nFDULCNURYIpd7w15wu01I5y8dy9NUOvZ3b
-XZ16mPKQpL2nGJe1wRS1jSpooeG5TAxvOwdKBLgzeqZ4I1FC0Dha70FfmWrJ0Opt
-sYTQ2jbCxtDx6tBHK1dw9OX/flxqmnxsvNJ/ALuzxbRMJL/j/Yi4SAHnAUtdOFqo
-VK/FxqVwqRRB7igCVIuviZbA7GeODnwah+Llv12vvfis+wipQQ5aKA9DpbK+KwP6
-OsgOZSBhvCCKvMGuxgVifzxSJeQxG2WoehEtuhnUCao+L7WE+NLY5hOUowsQLN+a
-/jlCye3nnQ0lb7ZOxHREazCbztPgO4VX/O40EwIDAQABo3kwdzBWBgNVHREETzBN
-gh13d3cudGVzdC51cHBmb2xqbmluZy5sYWRvay5zZYYsaHR0cHM6Ly93d3cudGVz
-dC51cHBmb2xqbmluZy5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFK9iv5wSca5C
-+6vltre0Ko+Z9X98MA0GCSqGSIb3DQEBBQUAA4ICAQBlidVziryz78l+6jlhxif+
-AXSJBQDeNoJ2ApxD9mBdJcXb4O/Huy2o5Ijo19vP0RPM6svK9TafHaOuGR1ZmlJe
-lQY+z+Decit9NsugZTaq2n2eMCqFhDy/Ybu8IEurJ9E09t2o5itqhGUgwJpG3BhV
-fdbKJSwoF2JSAn/PDZaNo9IdOGqxqHvVds4A6WzYVsDl0XiTqeMhb5My3K4nz8ER
-9VdsdldJTRqGp06pxkr2XLUSkX36yyV5uf2M1SR1aNl1WTVmB6/LePSOTgsUCV2r
-Xr6/QoflBFXZySNWV7f1klzl3MnmfOyWaBUILGh2Ke4/L2azEXil5jApeVnt+y6e
-Ql0ZjEruBkDpCkltdew1vaDRuJAPd5NC6LPXWjozZYNx8dNcze/yJTjoWwPltvf8
-0pAU9qPKqLrlX3ZWmtWh6ymT2XnK4mINjpcS3uDZDSkgMZAsgs8SpTdrgtE89sLz
-VqAUw5BQrZQYhV+AtqWCOnQcxaC9mLkdB6wpfZu5xrgWgQGcAvJM0lnOP/LAQPny
-jiCPF0Mux4hPUalhs5RJfQhUZBIo5c0PZSohzHn2pNIWMkppphOMEMrc/HBuDbAZ
-OGHgoQN0dxACvHw1YMHvyFWI+NYO1070o6sY9/MwGyrCClplXiMnDmfbyIsfvq6u
-qqt+VY+dgL11MGCZOGpJVg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml
deleted file mode 100644
index 5bff7c50..00000000
--- a/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uppfoljning.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.uppfoljning.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.uppfoljning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.uppfoljning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFODCCAyCgAwIBAgIJAOk6eA6bBSUAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHd3dy51cHBmb2xqbmluZy5sYWRvay5zZTAeFw0xNTEyMDQwNzMxMDNaFw0y
-NTEyMDEwNzMxMDNaMCMxITAfBgNVBAMTGHd3dy51cHBmb2xqbmluZy5sYWRvay5z
-ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMgvIKG0Iddz3FLny2fV
-YENWzgyr/dv0r+c0JDRp3P0bKoQnYiOC+XVAGi6e6u5XazWzkQJapQSO1W3z2eXG
-IWFaAYgZFsqINmIIKKcxN/n9Zevh88DgKa3Oz8S/5cTxhQflikDXvyaCeWy2hZKP
-uLt+mtCxmtBFZQqyWkSPIeb6naAAuMHba2xAfstM9mUJsobKJWjfg40jrhAHo2Kc
-LFES9ckL2IKbduC1RO9S98h8LoTGHI1KCegpmptyMveJL6r5bPJYRTuTCRyIDQ53
-WuzAuOMfTrvTX/2NO2zF7UWASRyZCSNjew/cfE7qL3YRJfeEMPDy/BTmtsdoBdHS
-J3zK1sNLfv8yaYOo2Ows9hFZeNKaFBMunXvIUBnXcfAZQMRutOXJYtC7Cfc0+djl
-3J/l9SLQfQfqxww8cf/RBWNMvjapL2IU5g2D7buEsgkxM56b0Yw3YZ1XMQHOy9pG
-BOEt6NaIdtTyz2dA1JxRurOCkPq3kNfHnJlYAuB9rNc8t5b34M/oZKA7cdVPBa+N
-Ty40YhjZw9Z05b4G+Y0nXMxORB7kJFqAjmBd59ZbhphqgCIkrRuzIMK+iouAlq2f
-lgsJ38oMW1f6DLVGH2GC2Sx81Ngq6BoJFUlJq/sE0fnUbdEpC/aQky5ph9rVCx7r
-yWewkliKVJemhyYYLXR3oas7AgMBAAGjbzBtMEwGA1UdEQRFMEOCGHd3dy51cHBm
-b2xqbmluZy5sYWRvay5zZYYnaHR0cHM6Ly93d3cudXBwZm9sam5pbmcubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBQsive1Oq4SvjwbaHCpcUagbKLD7jANBgkqhkiG
-9w0BAQUFAAOCAgEAMxAsYYpc23IeKioe+YkUMp5w5LSAzFw84Hbnvn7kpWZnCjkJ
-lWQIg43rfoP245VV5iete0s9yvMl5PrnFlGs/5SgTCBdrTXXSjMc9AbXW3WAMnpy
-Uj4mloSfwCURUtm6JlzlQE+cI2/2gqcjyX3NO5bm5ztNxJkMPH/eS8OmaG8PSUdd
-nHCgPGaXMRphFKa6PIOXjauWhSVZMXyQyFUo9NY6arc341qt3DmrrmrQhm6IvavH
-Z9h5c9sjOBqPT0BXMxDWgWkRih3R9nFsITd0rmZTJ1sOt4rDDq5UrTTUMCk6SdsJ
-VFbtw1UaIKfxxD/hI8kvt53dHPQFf07PJM5gHmi6rW0y9qGtgJlbo1gnavRDyIxQ
-7RY0JUZHZbwbErb76VVrq/IYfCRYn9ITSBNaRFmxCYmfk2glZE11MPNijg3/SdN2
-uUIuMpT3jxebMVF/jprgY3SXYVtylGd6jOWZmKqGxMQ0gII0StsMgAlk22MWr4HO
-vK6J9hwUI057LYBOpwF777iKoGTpAdDnk8wEpc/gD6OVAjdmPmoxq1F6aXQ/0Rb0
-9AHiq9QuIZvfZxuLZua08zjkw/PiD51rHgQ6xGabj5dag5rI+WzYvdqQf43Q+NRf
-In/ikXXTMoplS8tRzCrjMQsTrhAg8qemRbZ6iGMqy8/lXraUDplt75yZFcY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.grayzone.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.grayzone.ladok.se-gui-sp.xml
deleted file mode 100644
index a7c8fe62..00000000
--- a/swamid-2.0/www.utb.grayzone.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb.grayzone.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.utb.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.utb.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.utb.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.utb.grayzone.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.utb.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.utb.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAJPZjxg5+NvsMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGXd3dy51dGIuZ3JheXpvbmUubGFkb2suc2UwHhcNMTYwMzE0MTEzNTAwWhcN
-MjYwMzEyMTEzNTAwWjAkMSIwIAYDVQQDExl3d3cudXRiLmdyYXl6b25lLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyrtmI0m3IVrZcnzO
-+WFroBzzRtKcBRS3T+jrdamvtpcIWGuJVBuk9dRpDGwIaIxscdg67mye0ZOJZ6YS
-LqBxqz41/pD5PPc7skomgQO5zuTYJK3bV8DQpWVJqcZS2ulFtihCunAIryifab0x
-YFdqV1BMpgYlnW0W4ijNNyEiXTmTzgaaNuEU5p3jJV3csXI7nR4PDvK7+3p1HInv
-cvLpgwGAb5hHulY+VrkQ0ahuCtcXnjDrPi7zrz9YhCNvHHTrEj5gSldQNMA4vP+F
-gtD9mzoewXF6ohZ5SKY4O75adzOMG3KC49KO2iStqVns17W3G/77Ur8lBox/LpRa
-JHZHGwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudXRiLmdyYXl6b25lLmxhZG9r
-LnNlhihodHRwczovL3d3dy51dGIuZ3JheXpvbmUubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBSJ4KTf8+bflcMvJIakk+0CeJ1PGTANBgkqhkiG9w0BAQsFAAOCAQEA
-AOd9wK2YEAzyMSLLtiYH7LREWEbV/ZBJpUdEK1Lz9tM3jSIcZs/4cM2L5uTiJ3GL
-MW/lRZGA2UZuOy87eiN61PUXHF6P2cGtbNJiR3xwCUlsFpt3qtAW1ymI234hTbHD
-8VjClW1t4yrjtb9OY86EsyWlidl5TVFKA5lpA6gUhLb3esommGRobpTl7sjswwO9
-wpcYuvyt6attK8W6TOzPRnV+4jUjGCG+YIoZPx6/avKmzgbzVBP8MDjIgaFO9cWz
-2UEGOUva3jtbUucaTmwcoqTtGDrJHawS4Vx+/PuAFIyUwGgMsp88D7OpjzfOA48p
-dzE8INr6mv2sLjkxoHRQ1w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml
deleted file mode 100644
index 45b8092e..00000000
--- a/swamid-2.0/www.utb.resultat.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb.resultat.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.ate.ar.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ate.ar.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.ate.ar.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.utb.resultat.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.utb.resultat.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.utb.resultat.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAJyLrhu0abakMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy51dGIucmVzdWx0YXQubGFkb2suc2UwHhcNMTUwODEzMDU0NDEyWhcN
-MjUwODEwMDU0NDEyWjAkMSIwIAYDVQQDExl3d3cudXRiLnJlc3VsdGF0LmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyI86nKujx5JXCG7N
-qAj+fHYSFvNqZOUKVrWPjRfaR1OqI5orNoRuSqOiiw4cMYTXUH/vmL3DyyLTjyex
-GQIKHRAnpjqZ14jgSkIOYzu+7W5ZtSrevsBrygSbY4XuIohZPuRiu6la0yrF3dTA
-hD4OKVLEHtCl96A1bL9N3jbDwjomISIDGs8sMcabM+T6z8YElvPApzGU+8hqiNvQ
-mYTbVcNsajO0Mvnsza3N83k+m59GO4yvW0kIzuLTImIRUjgphdCEkUdwAurKSkck
-BEXBWYHovgZ/zRWuMcep/z9ypcuoMyvOQtRU3ZIVC2oTLL4tIaQ1wdQduaHaEzS4
-S2OEcQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudXRiLnJlc3VsdGF0LmxhZG9r
-LnNlhihodHRwczovL3d3dy51dGIucmVzdWx0YXQubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBRGdcODEnlSHaOHPoeEzgqaFEKpPjANBgkqhkiG9w0BAQUFAAOCAQEA
-YFdO9+FUXKhwjKymxYskLHrI0UDaKIhPa/eUBbdOMTadhgWxFcAGTbQGmNeeaXG/
-TrUmSHgjLUP6OI6VhfGeHplkCNnBqimdAbZvlW05tLzRDOhA2ducJp1gUpJiCGEz
-aS2SL0uMKg+Q1OxBp1h6YHmLepRQ6Pl+rgDQAmCqGEjlTArODZ2I4BPvYLZRFnxk
-wBC/rCtSpF435YYhsRL7Ce2yezSkyI6Y+aWsUJetrE0AnkanmC8PvNmbCaA4PErX
-tDihAqnhXAOCILglAIHVd42tpi41pfSjTEFhTcEbQh3j3UGx1cNyqenacTVJi98F
-apAEUGMycMZmEyVsAiP/hw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb.resultat.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
deleted file mode 100644
index 27db27bd..00000000
--- a/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb.uppfoljning.ladok.se/gui-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <mdui:Logo height="64" width="64">https://www.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www.utb.uppfoljning.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.utb.uppfoljning.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.utb.uppfoljning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJRuttYMy/CdMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHd3dy51dGIudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIzMDgyNzE0
-WhcNMjUxMDIwMDgyNzE0WjAnMSUwIwYDVQQDExx3d3cudXRiLnVwcGZvbGpuaW5n
-LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlHyyl8lw
-wkevAYlRJiSqa3yaCbU8D5cUNH9mIPojH1kfb1QXByscQPc9MwGR0tDl67o4+qr8
-f51okBl4+C/AfkGgsc2C+jvPhO/p16Uzw9AXCSN8Nzl+RHBUhONYOKgQA4OaRxOI
-As/rvAYZQEmqVoENANdNNJRi0Tqwqo9FxlX4q9XHwx+53oOfeXVMetMAi/uU75OT
-YCPW5F0Y72XQ2QPZkRNsqYK1IVqMCsgXS1VPiuqCyWHdUhesYC+S2279QrP2sXcJ
-xiQhohE7dY2vdgHLmQq+T2YERVIoGqCNxvKQ4JPeVr9MPVAN1uiJ3wiPpLxh4VVs
-Oa7beN4vr+KboQIDAQABo3cwdTBUBgNVHREETTBLghx3d3cudXRiLnVwcGZvbGpu
-aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy51dGIudXBwZm9sam5pbmcubGFkb2su
-c2UvZ3VpLXNwMB0GA1UdDgQWBBTUNZ+hmTCzgsSS3vs4dxj8Mm5kuzANBgkqhkiG
-9w0BAQUFAAOCAQEAkEPx2U0iQ4NfF+ixzf0LOBUT8njxb8lHfX4PjqinJS15N4si
-xGispD9fabYPNVGK500/Md/4Gl6MrPhsxbAMcRn9FL962JiuTccfsecGAv5+4BKY
-IjBj97jbFJ2fhsQBBaevgfNP2wLHsyQheQgAXY72cCG3OaZeTMMNECb1FG1MhvRt
-Zvdcx+ES1HMOgLCAU2BF/oYnuuGhwOI4H6jabKK44GbWeE0Mv8L/A5knUoujfR0n
-gUbDaBy4oNdSbv4VXVLXLD6XwwzJNfn8TGE8LQh3pvSAOdiTz4ie2ybYfXI2VKVG
-IgTd2o/JWpObjIU/AurReC6h+UPQ4M3O3lBYFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
index dea1c364..3ba20172 100644
--- a/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb1.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb1.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -35,10 +31,12 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.utb1.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.utb1.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.utb1.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.utb1.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utb1.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,24 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.utb1.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.utb1.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAM+qK4tCqL2EMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXd3dy51dGIxLmxhZG9rLnNlMB4XDTE3MDEyNjE0MzUyOFoXDTI3MDEyNDE0
-MzUyOFowHDEaMBgGA1UEAxMRd3d3LnV0YjEubGFkb2suc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/CuONAwz2GCkH2TOEyLL/oiv4FsUE8Hj4ZMmr
-ycIDlJW+hKNvkm33cVNaLqdwjhHTHcAtO1ft09RIETmm4xwy6vb/j/UKbxaWnScE
-dG4hjWSfaK1e+cus+TNPJqMRzAhAvbzswMUD/MTT2aujspLO0R8Jcv4Pv/vUlsEg
-y1JF996Z6uRP+7r0riycM/0m+WfMjVb6S4gY5W59i/6CECPMIfngITYTcMiksm/B
-uAPkZfjEtdMF3e+wYJYBq7Rf74glDqYis9noIljxq9b8Q3BsovY8MjGxDLW1fLQG
-otANZzvJxvPoqCf2232eDw5fFZqVyQNR5p+vY4FiLX1KA65DAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXd3dy51dGIxLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIxLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUa8S1EY5StIBDDNc9Ke2RkgGksjMwDQYJ
-KoZIhvcNAQELBQADggEBAGb8B+qZ1KmD0dv7iKxyEPjqf5pAaJgbNSnvQ0aj2iyX
-ISK8PFtdv1d9JExWJL0xFxQkVDPCxmEzONU/fS7fcEbgwRCQSnz0AXQA35MHt6Ok
-jWppAAdaHhrUkqNT0Cd6CUViu6NprlYFbX/urDuar8fNhWgQO3tP7e4WwzV1D6Fp
-bSCJgeB5rqOTKqtehIrVheBwN5NQai0zUxWGCaS+TRP61mJypCt+FZLEN1QN74PM
-Fc7ieensUcthlhlVjbDVwVEKHT2kC6AG9REMwd5lX7hthwtp8dqoG2pFd4rZszib
-OUYwmw3l+n/vYKmVA5j2HBJ7e68QgZokawXALKegbvY=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAM+qK4tCqL2EMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy51dGIxLmxhZG9rLnNlMB4XDTE3MDEyNjE0MzUyOFoXDTI3MDEyNDE0MzUyOFowHDEaMBgGA1UEAxMRd3d3LnV0YjEubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/CuONAwz2GCkH2TOEyLL/oiv4FsUE8Hj4ZMmrycIDlJW+hKNvkm33cVNaLqdwjhHTHcAtO1ft09RIETmm4xwy6vb/j/UKbxaWnScEdG4hjWSfaK1e+cus+TNPJqMRzAhAvbzswMUD/MTT2aujspLO0R8Jcv4Pv/vUlsEgy1JF996Z6uRP+7r0riycM/0m+WfMjVb6S4gY5W59i/6CECPMIfngITYTcMiksm/BuAPkZfjEtdMF3e+wYJYBq7Rf74glDqYis9noIljxq9b8Q3BsovY8MjGxDLW1fLQGotANZzvJxvPoqCf2232eDw5fFZqVyQNR5p+vY4FiLX1KA65DAgMBAAGjYTBfMD4GA1UdEQQ3MDWCEXd3dy51dGIxLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIxLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUa8S1EY5StIBDDNc9Ke2RkgGksjMwDQYJKoZIhvcNAQELBQADggEBAGb8B+qZ1KmD0dv7iKxyEPjqf5pAaJgbNSnvQ0aj2iyXISK8PFtdv1d9JExWJL0xFxQkVDPCxmEzONU/fS7fcEbgwRCQSnz0AXQA35MHt6OkjWppAAdaHhrUkqNT0Cd6CUViu6NprlYFbX/urDuar8fNhWgQO3tP7e4WwzV1D6FpbSCJgeB5rqOTKqtehIrVheBwN5NQai0zUxWGCaS+TRP61mJypCt+FZLEN1QN74PMFc7ieensUcthlhlVjbDVwVEKHT2kC6AG9REMwd5lX7hthwtp8dqoG2pFd4rZszibOUYwmw3l+n/vYKmVA5j2HBJ7e68QgZokawXALKegbvY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -92,4 +73,22 @@ OUYwmw3l+n/vYKmVA5j2HBJ7e68QgZokawXALKegbvY=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb1.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb3.ladok.se-gui-sp.xml b/swamid-2.0/www.utb3.ladok.se-gui-sp.xml
index 49470097..619f362c 100644
--- a/swamid-2.0/www.utb3.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb3.ladok.se-gui-sp.xml
@@ -26,16 +26,18 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb3.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utb3.ladok.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.utb3.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.utb3.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.utb3.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.utb3.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utb3.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.utb3.ladok.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.utb3.ladok.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -43,24 +45,7 @@
         <ds:KeyName>www.utb3.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.utb3.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKE1shMbDQIqMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMTEXd3dy51dGIzLmxhZG9rLnNlMB4XDTE3MDQxMzEyMDcxNVoXDTI3MDQxMTEy
-MDcxNVowHDEaMBgGA1UEAxMRd3d3LnV0YjMubGFkb2suc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCxIw/bHniAaXHE2Gu+kevVXVZH7VZlbzcGzuWJ
-+4Jg1OUFpf0PnJXBGgDkP7hH8T1h0yU78rF/hWlU0kxJa/TiJGYtozMa/V7Gca6z
-wfHAZMbUxJpwIOW/E2nhgyTcz3YWmgBdQAiLQhRIS7sM8IMAm/8CxAyxpU/OAKCl
-oGPXOMA39voykp7TV+++JpPAnFVuUCDoUmXy31Tm5V3sZSOB9VYaqDV5UC+vt/o4
-8fCWVB5AfY9StG4y1HXzMfsSRZdGJbTl1GRFIzwSOoVdYFNVbZkX/+rkcymYM26z
-RF1jQlwOv7buumxWstzY83RHhjMBGlno9zTwIVGpj0iPbCivAgMBAAGjYTBfMD4G
-A1UdEQQ3MDWCEXd3dy51dGIzLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIzLmxh
-ZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUiCY7mW4TF7+TRHaxS3nghP16niEwDQYJ
-KoZIhvcNAQELBQADggEBACXPU+KIVqnL+F+HG4p3cviDLEHnOhhfJR5a+EMM4rSi
-tIU05xBI2fkSm+VB3mMGU4gA9gb3Qle3zTrFIynII7J7o7gLnHwJW/AvAAJW6Pwk
-YrFDGfnOhifS9/0NoKrZI+5Uf/rDJfp8ySzkNnTpKDam6fVCNoFwru+j9KlRy8UD
-s5XXGWnw+aV0NpK8bnk9z9LJ8L0c0Tcou4ay8AJSCF/Un5BYGq3mc+BcsT98NxTO
-f9VTzFAGTHa4xkYorBqS4jYxzjY577jLo/Uqex8G9HhGH6gnbwNV7M3tX235wltj
-yQ5HytH/O/z5sZAbu2/+b4tN/nxKFZBck0ZTeHr0WRE=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAKE1shMbDQIqMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEXd3dy51dGIzLmxhZG9rLnNlMB4XDTE3MDQxMzEyMDcxNVoXDTI3MDQxMTEyMDcxNVowHDEaMBgGA1UEAxMRd3d3LnV0YjMubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxIw/bHniAaXHE2Gu+kevVXVZH7VZlbzcGzuWJ+4Jg1OUFpf0PnJXBGgDkP7hH8T1h0yU78rF/hWlU0kxJa/TiJGYtozMa/V7Gca6zwfHAZMbUxJpwIOW/E2nhgyTcz3YWmgBdQAiLQhRIS7sM8IMAm/8CxAyxpU/OAKCloGPXOMA39voykp7TV+++JpPAnFVuUCDoUmXy31Tm5V3sZSOB9VYaqDV5UC+vt/o48fCWVB5AfY9StG4y1HXzMfsSRZdGJbTl1GRFIzwSOoVdYFNVbZkX/+rkcymYM26zRF1jQlwOv7buumxWstzY83RHhjMBGlno9zTwIVGpj0iPbCivAgMBAAGjYTBfMD4GA1UdEQQ3MDWCEXd3dy51dGIzLmxhZG9rLnNlhiBodHRwczovL3d3dy51dGIzLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQUiCY7mW4TF7+TRHaxS3nghP16niEwDQYJKoZIhvcNAQELBQADggEBACXPU+KIVqnL+F+HG4p3cviDLEHnOhhfJR5a+EMM4rSitIU05xBI2fkSm+VB3mMGU4gA9gb3Qle3zTrFIynII7J7o7gLnHwJW/AvAAJW6PwkYrFDGfnOhifS9/0NoKrZI+5Uf/rDJfp8ySzkNnTpKDam6fVCNoFwru+j9KlRy8UDs5XXGWnw+aV0NpK8bnk9z9LJ8L0c0Tcou4ay8AJSCF/Un5BYGq3mc+BcsT98NxTOf9VTzFAGTHa4xkYorBqS4jYxzjY577jLo/Uqex8G9HhGH6gnbwNV7M3tX235wltjyQ5HytH/O/z5sZAbu2/+b4tN/nxKFZBck0ZTeHr0WRE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -88,4 +73,22 @@ yQ5HytH/O/z5sZAbu2/+b4tN/nxKFZBck0ZTeHr0WRE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
index aae3077f..acc65461 100644
--- a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utbildning.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -35,10 +31,12 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.utbildning.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.utbildning.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.utbildning.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.utbildning.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.utbildning.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,25 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.utbildning.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.utbildning.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAIp99LvTbKyqMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
-BAMTF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlMB4XDTE3MDMyNDE0NDcyMFoXDTI3
-MDMyMjE0NDcyMFowIjEgMB4GA1UEAxMXd3d3LnV0YmlsZG5pbmcubGFkb2suc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYI2lcthIZKs43KEJXYhwl
-RZfRHYehs0OOPRClgWVf1eH2CZtFuPoEFE7sXM5N16Ujfnqc8vVn5pbc60UHDrTs
-ZvycIfH6CwcrBL1iJLdpMzMAk37StPY84dY5YVNfNnBIuQNuXQSNPw5sPPHkxiqM
-/BsUMnJZTAQsX7n+WaP/rshu5cmztYlcJ67kOYVcv3hzUFSrqO4Zrx+UZPZL9CFq
-OtkyJZaPVTjzsyKml3U1cuVbNsv1o4baFyWPXp//ddGwh3OMSTSPn3j8H5BHbVK6
-Hkh2wAEIqXUn+SNGoUX6QcQAALIzal5jocJ1iY+H3NHuqNBdfU+7OYtErBK5Y5dt
-AgMBAAGjbTBrMEoGA1UdEQRDMEGCF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlhiZo
-dHRwczovL3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQU
-2WCwheUwJClRqisBK/bkVSC212AwDQYJKoZIhvcNAQELBQADggEBAHnsRGKyoh54
-cx2ecnsC0RDxHB7j5Y8dybPpivA4SHgtDnbjb2jQh3c2d1UMi9N7ZOxnA5RnoSj0
-Hs3bkvWSvOMrKSxNincKtAsp9BBclf/PLDlSN625vn3rpKhjbYLYo3LHlBqg3wNb
-skqc+3opaiFJ8zkRcCwdlgNObUzE4szRlnJJbEMqq2XSHsSbp7wpvI5tWIuzKmla
-tN2uV6cdX8AgOf4/vWc5AAwt16j9gLyFepruXj1EV8ZjLmT282EDdyrMF/ZWwrd/
-jvN+gJiBff8D5IUrBcEMarP5A1p3ipvDHedGUgFhtjt8XSHJ5SaeBFZxhmvWPAGQ
-QSA5AL5ESjY=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAIp99LvTbKyqMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNVBAMTF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlMB4XDTE3MDMyNDE0NDcyMFoXDTI3MDMyMjE0NDcyMFowIjEgMB4GA1UEAxMXd3d3LnV0YmlsZG5pbmcubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYI2lcthIZKs43KEJXYhwlRZfRHYehs0OOPRClgWVf1eH2CZtFuPoEFE7sXM5N16Ujfnqc8vVn5pbc60UHDrTsZvycIfH6CwcrBL1iJLdpMzMAk37StPY84dY5YVNfNnBIuQNuXQSNPw5sPPHkxiqM/BsUMnJZTAQsX7n+WaP/rshu5cmztYlcJ67kOYVcv3hzUFSrqO4Zrx+UZPZL9CFqOtkyJZaPVTjzsyKml3U1cuVbNsv1o4baFyWPXp//ddGwh3OMSTSPn3j8H5BHbVK6Hkh2wAEIqXUn+SNGoUX6QcQAALIzal5jocJ1iY+H3NHuqNBdfU+7OYtErBK5Y5dtAgMBAAGjbTBrMEoGA1UdEQRDMEGCF3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlhiZodHRwczovL3d3dy51dGJpbGRuaW5nLmxhZG9rLnNlL2d1aS1zcDAdBgNVHQ4EFgQU2WCwheUwJClRqisBK/bkVSC212AwDQYJKoZIhvcNAQELBQADggEBAHnsRGKyoh54cx2ecnsC0RDxHB7j5Y8dybPpivA4SHgtDnbjb2jQh3c2d1UMi9N7ZOxnA5RnoSj0Hs3bkvWSvOMrKSxNincKtAsp9BBclf/PLDlSN625vn3rpKhjbYLYo3LHlBqg3wNbskqc+3opaiFJ8zkRcCwdlgNObUzE4szRlnJJbEMqq2XSHsSbp7wpvI5tWIuzKmlatN2uV6cdX8AgOf4/vWc5AAwt16j9gLyFepruXj1EV8ZjLmT282EDdyrMF/ZWwrd/jvN+gJiBff8D5IUrBcEMarP5A1p3ipvDHedGUgFhtjt8XSHJ5SaeBFZxhmvWPAGQQSA5AL5ESjY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -93,4 +73,22 @@ QSA5AL5ESjY=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
index 24a6612c..389be8bb 100644
--- a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.verifiering1.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -35,10 +31,12 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.verifiering1.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.verifiering1.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.verifiering1.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.verifiering1.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.verifiering1.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,25 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.verifiering1.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.verifiering1.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOChsfr6DFrjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy52ZXJpZmllcmluZzEubGFkb2suc2UwHhcNMTYwOTA1MTQwNjUwWhcN
-MjYwOTAzMTQwNjUwWjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcxLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlVEkFZvjnVEETJj
-C1b/NOdgHjtibedIxC6pYvY7xYUYtSgusdCHG2Z+WOrDEqLeuM3Sfm9G4ewYhfzk
-3dHL15myQzO/xpy6f9XmsLu7oZP5sGVqkucAsXfmbaXiWQY05TI22O0FVJ/dlq9G
-oaakkJgdFcipJmMBvgj2vcKa2vGo/jBcTCtlaSnvgIVl3bqNFP0sxcp+5/rLAZnV
-z+kxyZeZrrEre1PZb16vdnU4i6x90CGcIHUB6nK/oNUI8BVYApuxZncOFSEYhMFB
-LeuKKmPyEV21QTcMWH3FtjsXLK5K4nAJu+JdIOsqmppS3rAFw5VtXjM2rFf+MMix
-C8YzrQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcxLmxhZG9r
-LnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzEubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBRb6eM7QsqDRQmqIeL1j3sNS+x1vzANBgkqhkiG9w0BAQUFAAOCAQEA
-riRWOhRQv8X73Kv6+FIN0BLkVH3Fnkq6IwOLrfCPahCRhLNe3qfx6jTCQFfWj162
-FzbXOm6jTfvr6kzcXpkBc9N2b0qXV77czFscVvs5Qwg9r9ArFcmEFkVrnNIHak7b
-44heq5qmCdImFzK2CEkJ6syLFkHwjTggWM8XYgMeulHnUI1iHVrBxzMYR25/uMQi
-FMmpcHFoh/tNSSh6gl+s5oMBEkMF6SVcK+EXhVOGuXDEdqxvje96p6qIUXkJ2e5u
-c3akmJfasQifXMizZU+RvYsZlAc6UJMZ4L9N9BNi27nblnkoEbdd5StI89xQ6jax
-Z6XnqgcSRWdfSe5JQXI4Yg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOChsfr6DFrjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXd3dy52ZXJpZmllcmluZzEubGFkb2suc2UwHhcNMTYwOTA1MTQwNjUwWhcNMjYwOTAzMTQwNjUwWjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcxLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlVEkFZvjnVEETJjC1b/NOdgHjtibedIxC6pYvY7xYUYtSgusdCHG2Z+WOrDEqLeuM3Sfm9G4ewYhfzk3dHL15myQzO/xpy6f9XmsLu7oZP5sGVqkucAsXfmbaXiWQY05TI22O0FVJ/dlq9GoaakkJgdFcipJmMBvgj2vcKa2vGo/jBcTCtlaSnvgIVl3bqNFP0sxcp+5/rLAZnVz+kxyZeZrrEre1PZb16vdnU4i6x90CGcIHUB6nK/oNUI8BVYApuxZncOFSEYhMFBLeuKKmPyEV21QTcMWH3FtjsXLK5K4nAJu+JdIOsqmppS3rAFw5VtXjM2rFf+MMixC8YzrQIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcxLmxhZG9rLnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzEubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBRb6eM7QsqDRQmqIeL1j3sNS+x1vzANBgkqhkiG9w0BAQUFAAOCAQEAriRWOhRQv8X73Kv6+FIN0BLkVH3Fnkq6IwOLrfCPahCRhLNe3qfx6jTCQFfWj162FzbXOm6jTfvr6kzcXpkBc9N2b0qXV77czFscVvs5Qwg9r9ArFcmEFkVrnNIHak7b44heq5qmCdImFzK2CEkJ6syLFkHwjTggWM8XYgMeulHnUI1iHVrBxzMYR25/uMQiFMmpcHFoh/tNSSh6gl+s5oMBEkMF6SVcK+EXhVOGuXDEdqxvje96p6qIUXkJ2e5uc3akmJfasQifXMizZU+RvYsZlAc6UJMZ4L9N9BNi27nblnkoEbdd5StI89xQ6jaxZ6XnqgcSRWdfSe5JQXI4Yg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -93,4 +73,22 @@ Z6XnqgcSRWdfSe5JQXI4Yg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering1.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
index f966d417..bd0b071d 100644
--- a/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering2.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.verifiering2.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -35,10 +31,12 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.verifiering2.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.verifiering2.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.verifiering2.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.verifiering2.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.verifiering2.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,25 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.verifiering2.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.verifiering2.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOPF0T70kbxjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXd3dy52ZXJpZmllcmluZzIubGFkb2suc2UwHhcNMTYxMTAzMTMxMDI1WhcN
-MjYxMTAxMTMxMDI1WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcyLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsEVoQfr9KHltT4wE
-ig9Zs+vsrU0AQh+Aox6hutgLp/iFKz6JzPVleN10NRchyc3VrEmwL43Wp1Jh6DW3
-XyofyGa3aT2/LkgUcR9ClTY82dUZa5NK7WjVPexUZPoLVKHGJsuvD6YFd07ibPda
-7iIy8hN+Ne6ZSp4HJUEsJkFcawosgnsF4rJ/SzGHQLV+q6oQHCn3mMPXR6HJPey3
-kYUUgvlENicoOntxtKbcaZ5BLGiDwgNVsNjesOz5JzEydKS2urdO7GsvRc2jvfwI
-TvcwDhsWoiGLqSHGKQ+0CrJ6tw51dPdfdPUeEfGrRzZIT0/QOW5tuHyi1XUROzZf
-jcoBFwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcyLmxhZG9r
-LnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzIubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBR5jokJc1gAbxQD8NghRE5nQtMpDDANBgkqhkiG9w0BAQUFAAOCAQEA
-I9xeF5VnW/WuBfNf7f9LfLzT7fcxoAnaZZpBnplR6746UE46jbDQa7L0bBy5qANf
-eVv3G5WFZpuQzBza2KyOeNdlR9F5ldDPFgtEFEkpYcB45tXWM7hGGyzRbg10GXNN
-9HMlLRcXdbV8BmvUxkFcJUas3tsmWj/W3PfCmNRDmBOBrgVY/YuDzcGm1oshldFw
-KAKgjjZMMe5vDAu9AGZWURVpVGocAVtkOjLQ0nZZ9qi6SRZdHd4O5h22vujfRi/0
-rm6/S+2nCwGRywXqEjAGc+A3O5raNvYp/r5egQB9lYFRG4YMI+3HoCTEiWYf9e/s
-+/nqZdArXL6iSqh/gH6MWw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOPF0T70kbxjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGXd3dy52ZXJpZmllcmluZzIubGFkb2suc2UwHhcNMTYxMTAzMTMxMDI1WhcNMjYxMTAxMTMxMDI1WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmcyLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsEVoQfr9KHltT4wEig9Zs+vsrU0AQh+Aox6hutgLp/iFKz6JzPVleN10NRchyc3VrEmwL43Wp1Jh6DW3XyofyGa3aT2/LkgUcR9ClTY82dUZa5NK7WjVPexUZPoLVKHGJsuvD6YFd07ibPda7iIy8hN+Ne6ZSp4HJUEsJkFcawosgnsF4rJ/SzGHQLV+q6oQHCn3mMPXR6HJPey3kYUUgvlENicoOntxtKbcaZ5BLGiDwgNVsNjesOz5JzEydKS2urdO7GsvRc2jvfwITvcwDhsWoiGLqSHGKQ+0CrJ6tw51dPdfdPUeEfGrRzZIT0/QOW5tuHyi1XUROzZfjcoBFwIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmcyLmxhZG9rLnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzIubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR5jokJc1gAbxQD8NghRE5nQtMpDDANBgkqhkiG9w0BAQUFAAOCAQEAI9xeF5VnW/WuBfNf7f9LfLzT7fcxoAnaZZpBnplR6746UE46jbDQa7L0bBy5qANfeVv3G5WFZpuQzBza2KyOeNdlR9F5ldDPFgtEFEkpYcB45tXWM7hGGyzRbg10GXNN9HMlLRcXdbV8BmvUxkFcJUas3tsmWj/W3PfCmNRDmBOBrgVY/YuDzcGm1oshldFwKAKgjjZMMe5vDAu9AGZWURVpVGocAVtkOjLQ0nZZ9qi6SRZdHd4O5h22vujfRi/0rm6/S+2nCwGRywXqEjAGc+A3O5raNvYp/r5egQB9lYFRG4YMI+3HoCTEiWYf9e/s+/nqZdArXL6iSqh/gH6MWw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -93,4 +73,22 @@ rm6/S+2nCwGRywXqEjAGc+A3O5raNvYp/r5egQB9lYFRG4YMI+3HoCTEiWYf9e/s
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering2.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
index 2488b190..19e3aaf4 100644
--- a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.verifiering3.ladok.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -35,10 +31,12 @@ and do *NOT* provide it in real time to your partners.
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Ladok www.verifiering3.ladok.se</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Ladok www.verifiering3.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
         <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
         <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.verifiering3.ladok.se/branded/HSK/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.verifiering3.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://www.verifiering3.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -47,25 +45,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>www.verifiering3.ladok.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=www.verifiering3.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANgmwmOahKcoMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
-BAMTGXd3dy52ZXJpZmllcmluZzMubGFkb2suc2UwHhcNMTcwNTA1MDkyMDA5WhcN
-MjcwNTAzMDkyMDA5WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmczLmxhZG9r
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoMkKJBKiVmiJ2em
-96OpucfAo/jgNJ/EDsbfw0R8xD93U1vs4EYE03vRSr3Qnoaxs4fgIJkQSvRXY7MO
-LsaSFJ99HZkMYsjSfFIqrhdK/HpfvnvzIUKaRbT6/dwdZEiL360X0JEpXn9N9ArV
-zpYFSzh/y++bs5vJG6M8gTE16dptsDeyvaKWHNPfDbMUk7HuTmm/dkP6uo4sNUbk
-PXKi8+sHhSmSSlX4CNsK2UxC+YudWaX2JUcKeON3RViIT7bskelv9Z3e1NY0QLD3
-ZESJnrZt6GnR/s4jmI6vouUL17qcECH4xPHWBH30GQso045R8FCJ2302L7eBLJOv
-pBy+6QIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmczLmxhZG9r
-LnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzMubGFkb2suc2UvZ3VpLXNwMB0G
-A1UdDgQWBBR+HpER+M2Mbg+nI1BT68eUuNcIbjANBgkqhkiG9w0BAQsFAAOCAQEA
-B63YL3Sq71Yw9D3Z9omKDWVhs7qzEhXk2qdGTQg+YDD6jKt/tuPHwzXnuxf6H79Z
-sR6mkZ/1eaeuZ8zfOiL7YJOLzV7peEUVrgolO6ys2jnfdTqhHs8a0qyCC0IiAvWD
-0xnhtwit0w5TZz0jrYb9mMe3jS50smpw7y6dEdTdGjW8qQYWKQEIH5Y4eqU0djF0
-jBdvGdDYtcuJOW2rb0rcnXwQN+ELGSgEkpQDD59BBQ9ymkiyqJfRkHZ7i0a8rfrD
-mG2qTD0tk+mAK0G+GIsFGLvoAI04kOu1X9oaMAbmcn/vwgiAZpAp7ybxVeiF+ma1
-XM/cnNAHoSS5B7k3xzLyaw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJANgmwmOahKcoMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNVBAMTGXd3dy52ZXJpZmllcmluZzMubGFkb2suc2UwHhcNMTcwNTA1MDkyMDA5WhcNMjcwNTAzMDkyMDA5WjAkMSIwIAYDVQQDExl3d3cudmVyaWZpZXJpbmczLmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoMkKJBKiVmiJ2em96OpucfAo/jgNJ/EDsbfw0R8xD93U1vs4EYE03vRSr3Qnoaxs4fgIJkQSvRXY7MOLsaSFJ99HZkMYsjSfFIqrhdK/HpfvnvzIUKaRbT6/dwdZEiL360X0JEpXn9N9ArVzpYFSzh/y++bs5vJG6M8gTE16dptsDeyvaKWHNPfDbMUk7HuTmm/dkP6uo4sNUbkPXKi8+sHhSmSSlX4CNsK2UxC+YudWaX2JUcKeON3RViIT7bskelv9Z3e1NY0QLD3ZESJnrZt6GnR/s4jmI6vouUL17qcECH4xPHWBH30GQso045R8FCJ2302L7eBLJOvpBy+6QIDAQABo3EwbzBOBgNVHREERzBFghl3d3cudmVyaWZpZXJpbmczLmxhZG9rLnNlhihodHRwczovL3d3dy52ZXJpZmllcmluZzMubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBR+HpER+M2Mbg+nI1BT68eUuNcIbjANBgkqhkiG9w0BAQsFAAOCAQEAB63YL3Sq71Yw9D3Z9omKDWVhs7qzEhXk2qdGTQg+YDD6jKt/tuPHwzXnuxf6H79ZsR6mkZ/1eaeuZ8zfOiL7YJOLzV7peEUVrgolO6ys2jnfdTqhHs8a0qyCC0IiAvWD0xnhtwit0w5TZz0jrYb9mMe3jS50smpw7y6dEdTdGjW8qQYWKQEIH5Y4eqU0djF0jBdvGdDYtcuJOW2rb0rcnXwQN+ELGSgEkpQDD59BBQ9ymkiyqJfRkHZ7i0a8rfrDmG2qTD0tk+mAK0G+GIsFGLvoAI04kOu1X9oaMAbmcn/vwgiAZpAp7ybxVeiF+ma1XM/cnNAHoSS5B7k3xzLyaw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -93,4 +73,22 @@ XM/cnNAHoSS5B7k3xzLyaw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering3.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Simon Johansson</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>