--- SURFconext/https%3A%2F%2Fekrksso.keeleressursid.ee%2Fsimplesaml%2Fmodule.php%2Fsaml%2Fsp%2Fmetadata.php%2Fekrk-sp.xml
+++ CLARIN IdP/https%3A%2F%2Fekrksso.keeleressursid.ee%2Fsimplesaml%2Fmodule.php%2Fsaml%2Fsp%2Fmetadata.php%2Fekrk-sp.xml
@@ -1,45 +1,59 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/metadata.php/ekrk-sp" validUntil="2025-04-16T00:10:01.462401Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/metadata.php/ekrk-sp">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join</RegistrationPolicy>
-    </RegistrationInfo>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
+      <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+      <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
+    </Attribute>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="de">CELR-Dienste</DisplayName>
         <DisplayName xml:lang="en">CELR services</DisplayName>
-        <DisplayName xml:lang="nl">CELR services</DisplayName>
+        <DisplayName xml:lang="et">EKRK teenused</DisplayName>
+        <DisplayName xml:lang="fi">CELR-palvelut</DisplayName>
+        <Description xml:lang="de">CELR-Dienste</Description>
         <Description xml:lang="en">CELR services</Description>
-        <Description xml:lang="nl">CELR services</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/clarino_duo-180.png</Logo>
+        <Description xml:lang="et">EKRK teenused</Description>
+        <Description xml:lang="fi">CELR-palvelut</Description>
+        <InformationURL xml:lang="en">http://keeleressursid.ee/en/</InformationURL>
+        <InformationURL xml:lang="et">http://keeleressursid.ee/et/</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://wiki.ut.ee/display/keeleressursid/Privacy+Policy+of+Center+of+Estonian+Language+Resources</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
           <X509Certificate>MIIFWDCCBECgAwIBAgIQCYJ16e8m9tvzhHoCM8gegjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjEyMDUwMDAwMDBaFw0xOTEyMTAxMjAwMDBaMIGVMQswCQYDVQQGEwJFRTERMA8GA1UECBMIVGFydHVtYWExDjAMBgNVBAcTBVRhcnR1MRcwFQYDVQQKDA5UYXJ0dSDDnGxpa29vbDEmMCQGA1UECxMdSW5zdGl0dXRlIG9mIENvbXB1dGVyIFNjaWVuY2UxIjAgBgNVBAMTGWVrcmtzc28ua2VlbGVyZXNzdXJzaWQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjP4akO8sgcwnshzvYz/XZj+1eXnsZxz4v7nYEefdDF+6jn777sd+5ThVWrj8GEub6GUi0SxSIcUP4jV4CS75vYTAz3CzPLq6sVRe2hnpOOvHvva2uUfSELt4D4G8QWhXcznD0BDzd/xJ1SkoJUveyHw2G0UB8KFW4aEfrUrzdmxVZLSGueR3l3uL0s92IRHqOTDWWFSOLLZJS4t/eBggcnWtcV1cPuEXnRFxG3bkaxn1aGli6xx2FJRTL3mSMULqV/ZdKAKXEKwsE9USCD8mc7B8uuOFlMwVag0P8n8b7HkpHQdI1CcjKRPjfGvzoxjRqM8H7oZrshO/nNkkLA1upAgMBAAGjggHSMIIBzjAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUlNEPHw6gHA0pkZKYIsJYVCXE5OYwJAYDVR0RBB0wG4IZZWtya3Nzby5rZWVsZXJlc3N1cnNpZC5lZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAIzsq1tYaNf2o4mtiuTvGgtrfl7n2xj2gveBCVkCIoU02BtlT6WxtiqBawDo+eD/BEfT5pzAmj0rLdFA4Mcm3dmAC66H+u6AUwMIGW7rjcYqr0m51X+atrl8oY2FFjddBI8WyEkb6DsxvrbM7NVsfgP6xzVFubx3svDb/WmpSdooyyTyWq71FHLU71zaW3S5OMSt3qM7+3G0dF+CyL5abrs0ksJHieYc0V/NAWZFrpYKdQAxyxLpg7yWA+eQzzufBaVPIIL7t5/n9bSeif01+FI/m4ltFAg+eKoO4qgI9PJz/OULHhZFOBQxuHu3htjYwIm7OOsIF3FFOYGSOt/VigQ==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIFWDCCBECgAwIBAgIQCYJ16e8m9tvzhHoCM8gegjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjEyMDUwMDAwMDBaFw0xOTEyMTAxMjAwMDBaMIGVMQswCQYDVQQGEwJFRTERMA8GA1UECBMIVGFydHVtYWExDjAMBgNVBAcTBVRhcnR1MRcwFQYDVQQKDA5UYXJ0dSDDnGxpa29vbDEmMCQGA1UECxMdSW5zdGl0dXRlIG9mIENvbXB1dGVyIFNjaWVuY2UxIjAgBgNVBAMTGWVrcmtzc28ua2VlbGVyZXNzdXJzaWQuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjP4akO8sgcwnshzvYz/XZj+1eXnsZxz4v7nYEefdDF+6jn777sd+5ThVWrj8GEub6GUi0SxSIcUP4jV4CS75vYTAz3CzPLq6sVRe2hnpOOvHvva2uUfSELt4D4G8QWhXcznD0BDzd/xJ1SkoJUveyHw2G0UB8KFW4aEfrUrzdmxVZLSGueR3l3uL0s92IRHqOTDWWFSOLLZJS4t/eBggcnWtcV1cPuEXnRFxG3bkaxn1aGli6xx2FJRTL3mSMULqV/ZdKAKXEKwsE9USCD8mc7B8uuOFlMwVag0P8n8b7HkpHQdI1CcjKRPjfGvzoxjRqM8H7oZrshO/nNkkLA1upAgMBAAGjggHSMIIBzjAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUlNEPHw6gHA0pkZKYIsJYVCXE5OYwJAYDVR0RBB0wG4IZZWtya3Nzby5rZWVsZXJlc3N1cnNpZC5lZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAIzsq1tYaNf2o4mtiuTvGgtrfl7n2xj2gveBCVkCIoU02BtlT6WxtiqBawDo+eD/BEfT5pzAmj0rLdFA4Mcm3dmAC66H+u6AUwMIGW7rjcYqr0m51X+atrl8oY2FFjddBI8WyEkb6DsxvrbM7NVsfgP6xzVFubx3svDb/WmpSdooyyTyWq71FHLU71zaW3S5OMSt3qM7+3G0dF+CyL5abrs0ksJHieYc0V/NAWZFrpYKdQAxyxLpg7yWA+eQzzufBaVPIIL7t5/n9bSeif01+FI/m4ltFAg+eKoO4qgI9PJz/OULHhZFOBQxuHu3htjYwIm7OOsIF3FFOYGSOt/VigQ==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-logout.php/ekrk-sp"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-acs.php/ekrk-sp" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml1-acs.php/ekrk-sp" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-acs.php/ekrk-sp" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml1-acs.php/ekrk-sp/artifact" index="3"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">CELR services</ServiceName>
+      <ServiceName xml:lang="et">EKRK teenused</ServiceName>
+      <RequestedAttribute Name="eduPersonPrincipalName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
+      <RequestedAttribute Name="eduPersonTargetedId" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="o" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="mail" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Centre of Estonian Language Resources</OrganizationName>
-    <OrganizationName xml:lang="nl">Centre of Estonian Language Resources</OrganizationName>
+    <OrganizationName xml:lang="et">Eesti Keeleressursside Keskus</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Centre of Estonian Language Resources</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">Centre of Estonian Language Resources</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="et">Eesti Keeleressursside Keskus</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://keeleressursid.ee/en/</OrganizationURL>
+    <OrganizationURL xml:lang="et">http://keeleressursid.ee/et/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Mart</GivenName>
@@ -56,5 +70,4 @@
     <SurName>Liin</SurName>
     <EmailAddress>mailto:krista.liin@ut.ee</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical"/>
 </EntityDescriptor>