Merge branch 'master' of git.swamid.se:swamid-metadataHEADmd-2024-12-20-v02master

9 files changed, 376 insertions, 12 deletions

diff --git a/metadata/MaxALofIDP.txt b/metadata/MaxALofIDP.txt
index 02e48b69..c12ed399 100644
--- a/metadata/MaxALofIDP.txt
+++ b/metadata/MaxALofIDP.txt
@@ -38,7 +38,7 @@
 2 swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
 2 swamid-edugain/idp.ths.se-idp-shibboleth.xml
 2 swamid-edugain/idp.mdh.se-idp-shibboleth.xml
-2 swamid-edugain/idp.hb.se-idp-shibboleth.xml
+3 swamid-edugain/idp.hb.se-idp-shibboleth.xml
 2 swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
 2 swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
 2 swamid-edugain/idp.it.su.se-idp-shibboleth.xml
diff --git a/metadata/swamid-2.0/demo04.extutv.ladok.se-gui-sp.xml b/metadata/swamid-2.0/demo04.extutv.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..d967361c
--- /dev/null
+++ b/metadata/swamid-2.0/demo04.extutv.ladok.se-gui-sp.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo04.extutv.ladok.se/gui-sp">
+  <md:Extensions>
+    <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>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi2</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-12-17T20:03:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Ladok för personal demo04.extutv.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for employees demo04.extutv.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="64" height="64">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="64" height="64">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://ladokkonsortiet.se/vara-tjanster/systemet-ladok</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladokkonsortiet.se/in-english/about-us/the-ladok-system</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladokkonsortiet.se/om-oss/policies-och-dokument/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladokkonsortiet.se/in-english/about-us/policies-and-documents/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://demo04.extutv.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>demo04.extutv.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=demo04.extutv.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUKhTt+VOihcICWJkw0/a2te87VfwwDQYJKoZIhvcNAQELBQAwITEfMB0GA1UEAwwWZGVtbzA0LmV4dHV0di5sYWRvay5zZTAeFw0yNDA4MTIxNTE4MzdaFw0zNDA4MTAxNTE4MzdaMCExHzAdBgNVBAMMFmRlbW8wNC5leHR1dHYubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD1GV30W7VvIBsV7zixnL8u+4QjBtbvdaQfl4pSkyK1r/wDjMANEUuu7ocFbZZFR005Kha4Hrf2Rm78i6wUIjPewZb/lkx5y10v0zRUKrn/4hSyye9omgzwjczRkqReozVofg9Pvv3GTkKkALsyskfHSrq9+pFmoOCzRopm6Vb/hX3vlFJRozmZAabIqtiuoeU6xQ1KaaLa1yEr/xfsdEphJZidov9ksvkfo8zLoWjSg9hhA1Upr5o8D7eMSAviqvewGgt8WggewjhkXY3McrkUUO9sD6tp/46iOuuYTmB1xMzFrOl3eN8FB6byPnpebcU8sgI4s4VFAUJ5LEzfKB9XEpcQHzlPoXSSXngr/h3YsBlktpr7so4D3VKCEYEucQ+JquvZCxVw/uWXxjnZWcpogRJsdwnerr0KQu4ecswqzMDdgI9zc6a8Eh79XZpakl0zp+qvdBZE7onsOhhHublK3DcA2i+p+d3FwurQp5g8xMnyyrpYOCmiHBXAxzAoDBLJkEDoSKeZx4uupLJiQzSwArGy2rbP5H5vL9RVkih1kHzoWHOcTZrCfeDGdZ8PrFO2vWBxbR5JHCq9ZatZ3dBO5h/mKhJxihfB/DKFKLlZWdufmEXOiTL75G52RbQmWUyScBWxNclY8f5TXEEGyAAfBStCwDgRPZLBC6fQX9VzowIDAQABo1AwTjAdBgNVHQ4EFgQU/wWQVR/fLp2DwAgdTOoR79qkI88wHwYDVR0jBBgwFoAU/wWQVR/fLp2DwAgdTOoR79qkI88wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEA0qq0i/wU703fM8qZofxMrA39iI5YYj1l50TdH9Z2zcRbqjeGnW+pe4mU/vRiVPFUTvMbgVkP98GfZyRB5AESdz4Tgz9TbMWyW+EgFXqgNzKeA6ymbRegoYFcxf7xAP/dgxIYH/LG32EWQNHFUu0eFyEMkE9xBLmcWJFsKJKoQVSP+Aq5ADfiAQDHw71QHCq1yCWa6R29S4Z2eyYAvK5MbolLrZsP57dlvN6AZhbBc/I7d5KYcVpxydmf62Kh5XbpbZ1kdVx0KtO+A8jzcZk3LyN7dPmcCtjvBiThEwJwFKtEqzxJYnuCsrgVttjdXQ0SAOMFnIeWHcXcx+QIwzneq53XCGtWP8jQ2dMuhcKE9xuDSf/8Hmm5i8o9807f3gG0DMxVXbNbP33/Ov1ULWRwZNbPLiVa6KAQOSJn8rDND90vIZd8kbjCIn4YQLtzOB0Ofg6NQR98GR74ejV/8pEL8zk6nD7F/JpaDFzTQm4TSZRhv9HeLdzTHbWUCrTdOFNhinh9Gzr65XtMGid3SUcmLN4KcnHoGIk82UIQDwB6LqD++GtS2Jl1ppHCiyS2en8AY5dcQC3MJ40YJSf+QQdkgw7EogHGCJtLqj9GOdJanHCWjyVZqLtTeGVYmf4Sio/r6AopBkoiOUIB3GHS47Z4LmLQvamR5BVfmDtK6m5ihbU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>https://demo04.extutv.ladok.se/gui-sp</ds:KeyName>
+        <ds:KeyName>demo04.extutv.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=demo04.extutv.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUKhTt+VOihcICWJkw0/a2te87VfwwDQYJKoZIhvcNAQELBQAwITEfMB0GA1UEAwwWZGVtbzA0LmV4dHV0di5sYWRvay5zZTAeFw0yNDA4MTIxNTE4MzdaFw0zNDA4MTAxNTE4MzdaMCExHzAdBgNVBAMMFmRlbW8wNC5leHR1dHYubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD1GV30W7VvIBsV7zixnL8u+4QjBtbvdaQfl4pSkyK1r/wDjMANEUuu7ocFbZZFR005Kha4Hrf2Rm78i6wUIjPewZb/lkx5y10v0zRUKrn/4hSyye9omgzwjczRkqReozVofg9Pvv3GTkKkALsyskfHSrq9+pFmoOCzRopm6Vb/hX3vlFJRozmZAabIqtiuoeU6xQ1KaaLa1yEr/xfsdEphJZidov9ksvkfo8zLoWjSg9hhA1Upr5o8D7eMSAviqvewGgt8WggewjhkXY3McrkUUO9sD6tp/46iOuuYTmB1xMzFrOl3eN8FB6byPnpebcU8sgI4s4VFAUJ5LEzfKB9XEpcQHzlPoXSSXngr/h3YsBlktpr7so4D3VKCEYEucQ+JquvZCxVw/uWXxjnZWcpogRJsdwnerr0KQu4ecswqzMDdgI9zc6a8Eh79XZpakl0zp+qvdBZE7onsOhhHublK3DcA2i+p+d3FwurQp5g8xMnyyrpYOCmiHBXAxzAoDBLJkEDoSKeZx4uupLJiQzSwArGy2rbP5H5vL9RVkih1kHzoWHOcTZrCfeDGdZ8PrFO2vWBxbR5JHCq9ZatZ3dBO5h/mKhJxihfB/DKFKLlZWdufmEXOiTL75G52RbQmWUyScBWxNclY8f5TXEEGyAAfBStCwDgRPZLBC6fQX9VzowIDAQABo1AwTjAdBgNVHQ4EFgQU/wWQVR/fLp2DwAgdTOoR79qkI88wHwYDVR0jBBgwFoAU/wWQVR/fLp2DwAgdTOoR79qkI88wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEA0qq0i/wU703fM8qZofxMrA39iI5YYj1l50TdH9Z2zcRbqjeGnW+pe4mU/vRiVPFUTvMbgVkP98GfZyRB5AESdz4Tgz9TbMWyW+EgFXqgNzKeA6ymbRegoYFcxf7xAP/dgxIYH/LG32EWQNHFUu0eFyEMkE9xBLmcWJFsKJKoQVSP+Aq5ADfiAQDHw71QHCq1yCWa6R29S4Z2eyYAvK5MbolLrZsP57dlvN6AZhbBc/I7d5KYcVpxydmf62Kh5XbpbZ1kdVx0KtO+A8jzcZk3LyN7dPmcCtjvBiThEwJwFKtEqzxJYnuCsrgVttjdXQ0SAOMFnIeWHcXcx+QIwzneq53XCGtWP8jQ2dMuhcKE9xuDSf/8Hmm5i8o9807f3gG0DMxVXbNbP33/Ov1ULWRwZNbPLiVa6KAQOSJn8rDND90vIZd8kbjCIn4YQLtzOB0Ofg6NQR98GR74ejV/8pEL8zk6nD7F/JpaDFzTQm4TSZRhv9HeLdzTHbWUCrTdOFNhinh9Gzr65XtMGid3SUcmLN4KcnHoGIk82UIQDwB6LqD++GtS2Jl1ppHCiyS2en8AY5dcQC3MJ40YJSf+QQdkgw7EogHGCJtLqj9GOdJanHCWjyVZqLtTeGVYmf4Sio/r6AopBkoiOUIB3GHS47Z4LmLQvamR5BVfmDtK6m5ihbU=</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://demo04.extutv.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo04.extutv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
+      <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto: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:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto: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:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/demo04.extutv.ladok.se-student-sp.xml b/metadata/swamid-2.0/demo04.extutv.ladok.se-student-sp.xml
new file mode 100644
index 00000000..f599f9db
--- /dev/null
+++ b/metadata/swamid-2.0/demo04.extutv.ladok.se-student-sp.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://demo04.extutv.ladok.se/student-sp">
+  <md:Extensions>
+    <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>
+      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi2</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/eidas-naturalperson</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/ec/1.0/loa3-pnr</samla:AttributeValue>
+        <samla:AttributeValue>http://id.elegnamnden.se/st/1.0/public-sector-sp</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/sc/eid-choice-2017</samla:AttributeValue>
+        <samla:AttributeValue>http://id.swedenconnect.se/contract/Sunet/BankID-idp</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-12-17T20:04:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Ladok för studenter demo04.extutv.ladok.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for students demo04.extutv.ladok.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="64" height="64">https://www.student.ladok.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="64" height="64">https://www.student.ladok.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://ladokkonsortiet.se/vara-tjanster/systemet-ladok</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladokkonsortiet.se/in-english/about-us/the-ladok-system</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladokkonsortiet.se/om-oss/policies-och-dokument/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladokkonsortiet.se/in-english/about-us/policies-and-documents/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://demo04.extutv.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>demo04.extutv.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=demo04.extutv.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUNPA6/D5qbI3unO3pzoIrvH3RSPgwDQYJKoZIhvcNAQELBQAwITEfMB0GA1UEAwwWZGVtbzA0LmV4dHV0di5sYWRvay5zZTAeFw0yNDA4MTIxNTE5MzVaFw0zNDA4MTAxNTE5MzVaMCExHzAdBgNVBAMMFmRlbW8wNC5leHR1dHYubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCksgxnx8nKgaqEV+fr+q2d+2soqsb8GlhnxJaQ6LA1aOxqQVH8R734ylu9Co7bLmKVEhKQBxGSt6Pj0JtCSVWfiJfxKXBI36UGK/eHDoHtbbBbsjGCM5+aA8fzjOUMg8yT5EJrO96x6k9Oc4KWcizCfjxTL3uHIt+6nO44RR37d7yuKR3kHQoNs+YKJKH8HJxOIAXb4yEDAGf5ckIhgegJyFntzxGw7J50cu+HuK2YylQvLj53gfi0wZh0Dre+Y5toDH+TlEeDfKwPWqB5OnmSeMBBWcT9PG7CyCgzFHDrcA5bTqf6NAonxOGh+h5XqrdVnr5Gi8Sd3j4IihvJ3sKWL9YbZZqiueTkn+sdyTwvQVVTz3augAQeEIsMAg/4SBFyPvt6lmqyDqChObmJjY3zRmaK1yYxpj9fgBGbhvzb2OZBHj0XBJ+9icX5xTDG3fAvP43JQ2pnvDPEhtAY6n2zwhorw+na67WGOfglXHdwtYseUHxidy4MHD4pQwmnvK7iJqWCbrAmLNBRKiQSkjin80hREQcQ4/1DnminQ/IWiPpNqm3W0uhmL1Pmvn+TcJZoBz0LYn8DfDbyhNzC0zIx+FjpyUAZBrCMF9GN0KIUA7eINKb3aEUqIS1CT/QqITrLDmmRyoC/6STLV1khSIYtikF7uz0QQ78chDxlJu4akwIDAQABo1AwTjAdBgNVHQ4EFgQUrOEYkBIuImLY4S3pa7QvYfYRYI0wHwYDVR0jBBgwFoAUrOEYkBIuImLY4S3pa7QvYfYRYI0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAY7WpURIFDLSs759YGtu41eglas1WgM1jNQGQQGONnCxJX6OOed73B2c7dPz2ILIc2xNIDJEPezEJki/yfyrQeZGXVTQvz7+7RdO6b7toq1Kegcq2NPgAHuuUxHNxHLRoDs6UNrNO6cD6bPbZpLPwzjdQ7SmJ7e1RXK+vZLomQnpjz9uB793TBZ1XnNXS8+RIrPd3Z8lzhFNPct9+o6a8J0t4qnqlrUFBra1UbmLEJAEULhr3253/d51KqXDuKUt8y0G0uRPGEQAPr+eHQxFUMGl8447w6ieSgdZ4gTgJRTPX4cDfdJfFruTmIN+u+9fyO2un0CbBF2g5xEkYiy9upAZdTeFBcY5qp2r3NuLpyg76acHxYScdAKP4PFID+otNxoY/HQsOTfniKNYYBz6MRrnDO5/mrr3pTbKNx0a4vJxLbHH8mtUGM4PWjkw9rUGnz33EomwBV71d1fkwfaoidEXomP3Ai9ilr7kp3RfC1Gr9eKJDr28A7fTC9IjSpskGLBGKhmwnGchN20Q+5998vaXPAWS3KgMl0a78U3ykmNLkRk6mWlzlGiJ7wjrY6nf+30gnhPEhayRrs0JTdQQFDkSWyp48iCNZSvwifzwbJRFFQ10MD9l8TUnmKBITm1O78ng7TqKlURjav26OR8MnsHsi9K+/kZAJenVhE1uxIT4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>https://demo04.extutv.ladok.se/student-sp</ds:KeyName>
+        <ds:KeyName>demo04.extutv.ladok.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=demo04.extutv.ladok.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCAwigAwIBAgIUNPA6/D5qbI3unO3pzoIrvH3RSPgwDQYJKoZIhvcNAQELBQAwITEfMB0GA1UEAwwWZGVtbzA0LmV4dHV0di5sYWRvay5zZTAeFw0yNDA4MTIxNTE5MzVaFw0zNDA4MTAxNTE5MzVaMCExHzAdBgNVBAMMFmRlbW8wNC5leHR1dHYubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCksgxnx8nKgaqEV+fr+q2d+2soqsb8GlhnxJaQ6LA1aOxqQVH8R734ylu9Co7bLmKVEhKQBxGSt6Pj0JtCSVWfiJfxKXBI36UGK/eHDoHtbbBbsjGCM5+aA8fzjOUMg8yT5EJrO96x6k9Oc4KWcizCfjxTL3uHIt+6nO44RR37d7yuKR3kHQoNs+YKJKH8HJxOIAXb4yEDAGf5ckIhgegJyFntzxGw7J50cu+HuK2YylQvLj53gfi0wZh0Dre+Y5toDH+TlEeDfKwPWqB5OnmSeMBBWcT9PG7CyCgzFHDrcA5bTqf6NAonxOGh+h5XqrdVnr5Gi8Sd3j4IihvJ3sKWL9YbZZqiueTkn+sdyTwvQVVTz3augAQeEIsMAg/4SBFyPvt6lmqyDqChObmJjY3zRmaK1yYxpj9fgBGbhvzb2OZBHj0XBJ+9icX5xTDG3fAvP43JQ2pnvDPEhtAY6n2zwhorw+na67WGOfglXHdwtYseUHxidy4MHD4pQwmnvK7iJqWCbrAmLNBRKiQSkjin80hREQcQ4/1DnminQ/IWiPpNqm3W0uhmL1Pmvn+TcJZoBz0LYn8DfDbyhNzC0zIx+FjpyUAZBrCMF9GN0KIUA7eINKb3aEUqIS1CT/QqITrLDmmRyoC/6STLV1khSIYtikF7uz0QQ78chDxlJu4akwIDAQABo1AwTjAdBgNVHQ4EFgQUrOEYkBIuImLY4S3pa7QvYfYRYI0wHwYDVR0jBBgwFoAUrOEYkBIuImLY4S3pa7QvYfYRYI0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAY7WpURIFDLSs759YGtu41eglas1WgM1jNQGQQGONnCxJX6OOed73B2c7dPz2ILIc2xNIDJEPezEJki/yfyrQeZGXVTQvz7+7RdO6b7toq1Kegcq2NPgAHuuUxHNxHLRoDs6UNrNO6cD6bPbZpLPwzjdQ7SmJ7e1RXK+vZLomQnpjz9uB793TBZ1XnNXS8+RIrPd3Z8lzhFNPct9+o6a8J0t4qnqlrUFBra1UbmLEJAEULhr3253/d51KqXDuKUt8y0G0uRPGEQAPr+eHQxFUMGl8447w6ieSgdZ4gTgJRTPX4cDfdJfFruTmIN+u+9fyO2un0CbBF2g5xEkYiy9upAZdTeFBcY5qp2r3NuLpyg76acHxYScdAKP4PFID+otNxoY/HQsOTfniKNYYBz6MRrnDO5/mrr3pTbKNx0a4vJxLbHH8mtUGM4PWjkw9rUGnz33EomwBV71d1fkwfaoidEXomP3Ai9ilr7kp3RfC1Gr9eKJDr28A7fTC9IjSpskGLBGKhmwnGchN20Q+5998vaXPAWS3KgMl0a78U3ykmNLkRk6mWlzlGiJ7wjrY6nf+30gnhPEhayRrs0JTdQQFDkSWyp48iCNZSvwifzwbJRFFQ10MD9l8TUnmKBITm1O78ng7TqKlURjav26OR8MnsHsi9K+/kZAJenVhE1uxIT4=</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://demo04.extutv.ladok.se:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/NIM/Artifact"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo04.extutv.ladok.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
+      <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladokkonsortiet.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladokkonsortiet.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto: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:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto: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:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/luvit.education.lu.se-shibboleth.xml b/metadata/swamid-2.0/luvit.education.lu.se-shibboleth.xml
index f519924e..79805129 100644
--- a/metadata/swamid-2.0/luvit.education.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/luvit.education.lu.se-shibboleth.xml
@@ -26,7 +26,7 @@
       </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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://luvit.education.lu.se/Shibboleth.sso/Login-lu"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://luvit.education.lu.se/Shibboleth.sso/Login-swamid" index="1"/>
@@ -86,8 +86,6 @@ OTMXxdAawBca6aO1CpUMAwipgLVKJyNkmxV7+aPSdkp/U466LROEWhraZg==</ds:X509Certificate
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Grade AB</md:OrganizationName>
diff --git a/metadata/swamid-edugain/idp.hb.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hb.se-idp-shibboleth.xml
index 1811947e..63b182be 100644
--- a/metadata/swamid-edugain/idp.hb.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hb.se-idp-shibboleth.xml
@@ -8,6 +8,7 @@
       <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
diff --git a/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
index 9d70761b..6c569bc0 100644
--- a/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
@@ -20,7 +20,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.du.se/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://login.du.se/error/?error_code=ERRORURL_CODE&amp;error_ts=ERRORURL_TS&amp;error_rp=ERRORURL_RP&amp;error_tid=ERRORURL_TID&amp;error_ctx=ERRORURL_CTX">
     <md:Extensions>
       <shibmd:Scope regexp="false">du.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -68,11 +68,9 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.du.se/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
diff --git a/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml b/metadata/swamid-edugain/sam.cs.lth.se-shibboleth.xml
index 15a2c3a5..15a2c3a5 100644
--- a/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-edugain/sam.cs.lth.se-shibboleth.xml
diff --git a/metadata/swamid-edugain/signservice.edusign.sunet.se-edusign-prod-sunet.xml b/metadata/swamid-edugain/signservice.edusign.sunet.se-edusign-prod-sunet.xml
new file mode 100644
index 00000000..324b3187
--- /dev/null
+++ b/metadata/swamid-edugain/signservice.edusign.sunet.se-edusign-prod-sunet.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://signservice.edusign.sunet.se/edusign-prod-sunet">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-12-17T12:37:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">SUNET eduSign Signeringstjänst (production)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUNET eduSign SigningServce (production)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNET eduSign SignService</mdui:Description>
+        <mdui:Description xml:lang="sv">SUNET eduSign Signeringstjänst</mdui:Description>
+        <mdui:Logo height="50" width="201" xml:lang="sv">https://signservice-geant.edusign.sunet.se/images/eduSign.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/eduSign+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/services/sakerhet/edusign/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="50" width="201">https://signservice-geant.edusign.sunet.se/images/eduSign.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>SignService SAML Signing</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFdzCCA1+gAwIBAgIUNmqgYCziNuvck3MWXDjE/JCFsFowDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCU0UxDjAMBgNVBAoMBVN1bmV0MRAwDgYDVQQLDAdFZHVzaWduMRowGAYDVQQDDBFTaWduU2VydmljZSBHZWFudDAeFw0yNDA0MTYxMDE3NTJaFw0zNDA0MTQxMDE3NTJaMEsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTdW5ldDEQMA4GA1UECwwHRWR1c2lnbjEaMBgGA1UEAwwRU2lnblNlcnZpY2UgR2VhbnQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCps6wDvjhTPNkoWllndrxOr8nC9qyXjzXZfPstD9JVyW4TrDpgX0mLHZEdeQsxxgruKU/qvQy5CeBdgJ5xmRVo28nVgmTAuifLNul9pyeQYMBfHzIRuAeRafTy3pwoTgv3RqaEk6w+WproKjVxL+tLzSvYNalarVjyKOO/PWObjKcZW/at9fVBtIMFR/6dAvhsoDpo3gyLL33EFI0nFnE86/d8qH4FPZRWVgpuEXr/VlUQO+2eqDhoi1T/8+WdIpcux7spZjmAyjRj9h5pfQO76GV+Vz45eZZEY04/3JdUzjh7ei1eageSAuZHzdJrxGFCVFi6IJ4dXy2XyfjkJlF2mwtE4TUP+5aQqTCtU3qkxkyVqbB8y/mnuCKL4fMQpLG9dLM2C0lZOdwfa3W8E1ZECn6WZZUIaZZiLQPWbZns3kwvQRY0ILWGmm66L/NBm8ZhPvR1F+2g9i9Tu6FMOZju2/5bZhxJYgI2AkWMu/IailA4xvrlSS7s6gy3pBC54QuOuu4rVQn54aC+EWVwe7UhHOjiy6EgfJg9fBAVzA2XsIkHIGfwP+xJArkMl4agIjmiF2wnbsjmVnzFrUtRHhDbTEPPTRjwfOICNPrevX5HjFrW86XzZ7ERY93AkC2u48/KPje/bm2aISAIXo5NV28ujOEarfJICTl23KXVU8Il9wIDAQABo1MwUTAdBgNVHQ4EFgQUgKBTUkyNRXcIUrniPmrwHkaSeuUwHwYDVR0jBBgwFoAUgKBTUkyNRXcIUrniPmrwHkaSeuUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAW3ivt1YLYkdT4Q6dqmiwvZ/gR2SeNxdfMLF2WOTQ1vMHB6RfOkFMaQ7p1As4YLb7wCqZ7BGps76Zflyim0CuGC8Gkkvo6OaS3Tb2KWL6LiSHMhTFCDTEXruf7e5uGXRA7otL3OSQYmBl3ECxy8mwEGVbu9OmpLz+G59eC3GTlXZSCVY6dqSAIUEIuYPAhvlpbKsscpxKLMHrfj6DOFNp/X73VW3tmiosFY7kAJVC13cYXMrj3C4JwT9BdIREU2pvhSZS5Awj69tg2fIoc5Xv4m2QdQg5M32ch/iWxDCFb5N+nLNpkiaDUFWr09tlzZs9Qnp+UYZ0lhxWWnKCYFaFmr1hWkG/pXA9UT7aAwpY6ke3yNCUsI5GsZEaqZ1ooBCFdp8NcEfnCIXx/dkrHtREAu3m6UZVr1yuv+Jt0t5ukw6lZD5icg7naWvcOeODUGABHcrxFtdEPOuPMjeBZVewo5gSIepRpBt2JAbcA04QKf0HbU1Ag14brxTp+s4vJqXuQiDBzf8o5u6TTsiYfOH1elVdU8tnmzfqGxh4/owQ0GODo+9XfV/u/akHPSCODrsT1LNgLi2F2tuXKXjFe/NkJqIBa/t7YEZ9JyaP27OwTf5IyLhvvQFw8Pu5+dBN8ShGWPSKIukdrDSTR30ZasQwgSFhuuREP3Zv8St6LrpehB4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>SignService SAML Decryption</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFdzCCA1+gAwIBAgIUNmqgYCziNuvck3MWXDjE/JCFsFowDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCU0UxDjAMBgNVBAoMBVN1bmV0MRAwDgYDVQQLDAdFZHVzaWduMRowGAYDVQQDDBFTaWduU2VydmljZSBHZWFudDAeFw0yNDA0MTYxMDE3NTJaFw0zNDA0MTQxMDE3NTJaMEsxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTdW5ldDEQMA4GA1UECwwHRWR1c2lnbjEaMBgGA1UEAwwRU2lnblNlcnZpY2UgR2VhbnQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCps6wDvjhTPNkoWllndrxOr8nC9qyXjzXZfPstD9JVyW4TrDpgX0mLHZEdeQsxxgruKU/qvQy5CeBdgJ5xmRVo28nVgmTAuifLNul9pyeQYMBfHzIRuAeRafTy3pwoTgv3RqaEk6w+WproKjVxL+tLzSvYNalarVjyKOO/PWObjKcZW/at9fVBtIMFR/6dAvhsoDpo3gyLL33EFI0nFnE86/d8qH4FPZRWVgpuEXr/VlUQO+2eqDhoi1T/8+WdIpcux7spZjmAyjRj9h5pfQO76GV+Vz45eZZEY04/3JdUzjh7ei1eageSAuZHzdJrxGFCVFi6IJ4dXy2XyfjkJlF2mwtE4TUP+5aQqTCtU3qkxkyVqbB8y/mnuCKL4fMQpLG9dLM2C0lZOdwfa3W8E1ZECn6WZZUIaZZiLQPWbZns3kwvQRY0ILWGmm66L/NBm8ZhPvR1F+2g9i9Tu6FMOZju2/5bZhxJYgI2AkWMu/IailA4xvrlSS7s6gy3pBC54QuOuu4rVQn54aC+EWVwe7UhHOjiy6EgfJg9fBAVzA2XsIkHIGfwP+xJArkMl4agIjmiF2wnbsjmVnzFrUtRHhDbTEPPTRjwfOICNPrevX5HjFrW86XzZ7ERY93AkC2u48/KPje/bm2aISAIXo5NV28ujOEarfJICTl23KXVU8Il9wIDAQABo1MwUTAdBgNVHQ4EFgQUgKBTUkyNRXcIUrniPmrwHkaSeuUwHwYDVR0jBBgwFoAUgKBTUkyNRXcIUrniPmrwHkaSeuUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAW3ivt1YLYkdT4Q6dqmiwvZ/gR2SeNxdfMLF2WOTQ1vMHB6RfOkFMaQ7p1As4YLb7wCqZ7BGps76Zflyim0CuGC8Gkkvo6OaS3Tb2KWL6LiSHMhTFCDTEXruf7e5uGXRA7otL3OSQYmBl3ECxy8mwEGVbu9OmpLz+G59eC3GTlXZSCVY6dqSAIUEIuYPAhvlpbKsscpxKLMHrfj6DOFNp/X73VW3tmiosFY7kAJVC13cYXMrj3C4JwT9BdIREU2pvhSZS5Awj69tg2fIoc5Xv4m2QdQg5M32ch/iWxDCFb5N+nLNpkiaDUFWr09tlzZs9Qnp+UYZ0lhxWWnKCYFaFmr1hWkG/pXA9UT7aAwpY6ke3yNCUsI5GsZEaqZ1ooBCFdp8NcEfnCIXx/dkrHtREAu3m6UZVr1yuv+Jt0t5ukw6lZD5icg7naWvcOeODUGABHcrxFtdEPOuPMjeBZVewo5gSIepRpBt2JAbcA04QKf0HbU1Ag14brxTp+s4vJqXuQiDBzf8o5u6TTsiYfOH1elVdU8tnmzfqGxh4/owQ0GODo+9XfV/u/akHPSCODrsT1LNgLi2F2tuXKXjFe/NkJqIBa/t7YEZ9JyaP27OwTf5IyLhvvQFw8Pu5+dBN8ShGWPSKIukdrDSTR30ZasQwgSFhuuREP3Zv8St6LrpehB4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signservice-geant.edusign.sunet.se/sign/edusign-prod-sunet/saml/sso" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET eduSIGN Service</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SUNET eduSIGN - tjänst för e-signaturer</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mailLocalAddress" Name="urn:oid:2.16.840.1.113730.3.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 90-20 59 100</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 20 78 60</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SUNET</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SUNET CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/uraccess.net-shibboleth.xml b/metadata/swamid-edugain/uraccess.net-shibboleth.xml
index b280e06a..4446ebf0 100644
--- a/metadata/swamid-2.0/uraccess.net-shibboleth.xml
+++ b/metadata/swamid-edugain/uraccess.net-shibboleth.xml
@@ -27,18 +27,18 @@
       </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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uraccess.net/Shibboleth.sso/DS/ds.swamid.se"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uraccess.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</mdui:DisplayName>
         <mdui:Description xml:lang="sv">UR access innehåller ca 18000 TV- och radioprogram från Utbildningsradion.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ur.se/om-ur/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://uraccess.net/pages/information</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.ur.se/integritetspolicy/</mdui:PrivacyStatementURL>
         <mdui:DisplayName xml:lang="en">UR access - Medialibrary for Swedish Universitys</mdui:DisplayName>
         <mdui:Description xml:lang="en">UR access contains roundabout 18000 TV and Radio programs from UR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.ur.se/about-ur/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://uraccess.net/pages/information</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.ur.se/integritetspolicy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
@@ -89,8 +89,6 @@ RXmDTYIhHnjv+Sc7dzCbIA==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uraccess.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uraccess.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uraccess.net/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</md:ServiceName>
       <md:ServiceName xml:lang="en">Medialibrary for Swedish Universitys</md:ServiceName>