--- SURFconext/https%3A%2F%2Fclariah.hitz.eus%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fclariah.hitz.eus%2Fshibboleth.xml
@@ -1,56 +1,67 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://clariah.hitz.eus/shibboleth" validUntil="2025-12-22T07:18:21.718876045Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clariah.hitz.eus/shibboleth">
   <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/fileadmin/documents/mrps_dfn-aai_1.0.pdf</RegistrationPolicy>
-    </RegistrationInfo>
+    <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute">
+      <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>
+    </EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
         <DisplayName xml:lang="en">HiTZ / CLARIAH-ES Repository</DisplayName>
-        <DisplayName xml:lang="nl">HiTZ / CLARIAH-ES Repository</DisplayName>
         <Description xml:lang="en">Various services provided by the HiTZ Center (UPV/EHU) in the context of CLARIAH-ES.</Description>
-        <Description xml:lang="nl">Various services provided by the HiTZ Center (UPV/EHU) in the context of CLARIAH-ES.</Description>
-        <Logo height="220" width="195" xml:lang="en">https://clariah.hitz.eus/assets/images/logoa.png</Logo>
+        <DisplayName xml:lang="eu">HiTZ / CLARIAH-ES</DisplayName>
+        <Description xml:lang="eu">HiTZ Zentroak (UPV/EHU), CLARIAH-ES esparruan eskaintzen dituen hainbat zerbitzu.</Description>
+        <DisplayName xml:lang="es">HiTZ / CLARIAH-ES</DisplayName>
+        <Description xml:lang="es">Diversos servicios prestados por el Centro HiTZ (UPV/EHU) en el contexto de CLARIAH-ES.</Description>
+        <DisplayName xml:lang="fr">HiTZ / CLARIAH-ES</DisplayName>
+        <Description xml:lang="fr">Divers services fournis par le Centre HiTZ (UPV/EHU) dans le cadre de CLARIAH-ES.</Description>
+        <InformationURL xml:lang="en">https://www.clarin.eu/applications</InformationURL>
+        <Logo height="220" width="195">https://clariah.hitz.eus/assets/images/logoa.png</Logo>
+        <Keywords xml:lang="en">HiTZ CLARIAH-ES Repository Services</Keywords>
+        <Keywords xml:lang="eu">HiTZ CLARIAH-ES Biltegia Zerbitzu</Keywords>
+        <Keywords xml:lang="es">HiTZ CLARIAH-ES Repositorio Servicios</Keywords>
+        <Keywords xml:lang="fr">HiTZ CLARIAH-ES Dépôt Services</Keywords>
         <PrivacyStatementURL xml:lang="en">https://clariah.hitz.eus/info/privacy</PrivacyStatementURL>
       </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clariah.hitz.eus/Shibboleth.sso/Login"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clariah.ehu.eus/Shibboleth.sso/Login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIFTTCCA7WgAwIBAgIUUVsjdlv+p9QcTzTICnwxiuk8RecwDQYJKoZIhvcNAQELBQAwgbUxCzAJBgNVBAYTAkVTMREwDwYDVQQIDAhHaXB1emtvYTERMA8GA1UEBwwIRG9ub3N0aWExPjA8BgNVBAoMNUhpVFogQ2VudGVyLCBVbml2ZXJzaXR5IG9mIHRoZSBCYXNxdWUgQ291bnRyeSBVUFYvRUhVMRkwFwYDVQQDDBBjbGFyaWFoLmhpdHouZXVzMSUwIwYJKoZIhvcNAQkBFhZ4YWJpZXIuZ29lbmFnYUBlaHUuZXVzMB4XDTI0MTEwODA4NDAxM1oXDTM0MTEwNjA4NDAxM1owgbUxCzAJBgNVBAYTAkVTMREwDwYDVQQIDAhHaXB1emtvYTERMA8GA1UEBwwIRG9ub3N0aWExPjA8BgNVBAoMNUhpVFogQ2VudGVyLCBVbml2ZXJzaXR5IG9mIHRoZSBCYXNxdWUgQ291bnRyeSBVUFYvRUhVMRkwFwYDVQQDDBBjbGFyaWFoLmhpdHouZXVzMSUwIwYJKoZIhvcNAQkBFhZ4YWJpZXIuZ29lbmFnYUBlaHUuZXVzMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA30u764MqnMkUEHxZbL62J4RI3IhJ0oanCuMuZSMgMeYHN/MJdqnK971bAeTQNHPaQQyKO0HVjkqSR95Ag5d5MRdnzm7qDyVmD0SfEcVMcCVVqnnFDgKWkhe9GaRzy7xPNQGwYDF7WSboozzY3a2W73QHmVG23h0YtdLj/pHz4fuNxq3WIQyYImViyGSBUCndpOXCCnVCWbTbULM6hh0GcoyxpeOu0WBX6WNNkLP5Hm5ZhGNdRs9au0fLk2VoiooKFKphL1HVFwZrI5+lWqTGEJdr9zZLCagmnXTS4yGOPOx9ssQgdaB6NEJeUiVEYta89hPJzyRzodLzH8wILov7b97/wh+cPG/48SXmxsuYRShxa3e1LU0Nd/XKFgy081+cg3XzV6J+4JNDdR6uPb3+vjTO2hc7l/dJhIsxq3Ac5t5Bvwipk5g+WqXmMdHxdtnL+OdjF+vFliVJQ5WLfB/G7ekXCv6wrFEHyC7HM77lsFEUA/bQUjfeoypEDufntH01AgMBAAGjUzBRMB0GA1UdDgQWBBTvOKA1cC5Ww16NQeCPQnSVXORZrTAfBgNVHSMEGDAWgBTvOKA1cC5Ww16NQeCPQnSVXORZrTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBgQCE2BuZg3hTUmsLBDWj6oAWdJkK8gUjqO0ZaTCoaedh59mQSeDuNpsZiOXy+SDDDRZjeTEfJkSLZ+Iqte2iT6TGuE2XyJ/7VYyRHqAyjH1pWXZMZ888IAkWRslPVUeoP/VCPR0wSscba4BqTstdnxmrd3VHGJOR49yszB/KDfCHbQ8KG2Ki8fv0ba1nSEXti+fBMEHcJwRxDnXbIxQh3W80VUvTpohpjmIDsjOw8Y8w1vF7JrFdAZdq0abDdZ3Atz86Wb0s510hZ9ktEXMkFpH5A/gpiyGITNxr0+9kRqNh7hKlH3RmWdFRkC9dkWv/kLHdXniajc/Bjc+jvRwc+p4yICAub6RWnItorXIyms4XOcd7P3diNpXjsycSD+/5oRnIZeRqYjo1uXT8qYUtstbZo496sawbpS/A+x9UbhB6dQ8Me1+5ySmj9XLW+MkveqG6yDBshCjrHq4ysmks+CfHn+M57NAZ6lUFvWhA6wSae0JWRqlokBOaIj4Q2WeSXFE=</X509Certificate>
+          <X509Certificate>MIIFTTCCA7WgAwIBAgIUUVsjdlv+p9QcTzTICnwxiuk8RecwDQYJKoZIhvcNAQEL BQAwgbUxCzAJBgNVBAYTAkVTMREwDwYDVQQIDAhHaXB1emtvYTERMA8GA1UEBwwI RG9ub3N0aWExPjA8BgNVBAoMNUhpVFogQ2VudGVyLCBVbml2ZXJzaXR5IG9mIHRo ZSBCYXNxdWUgQ291bnRyeSBVUFYvRUhVMRkwFwYDVQQDDBBjbGFyaWFoLmhpdHou ZXVzMSUwIwYJKoZIhvcNAQkBFhZ4YWJpZXIuZ29lbmFnYUBlaHUuZXVzMB4XDTI0 MTEwODA4NDAxM1oXDTM0MTEwNjA4NDAxM1owgbUxCzAJBgNVBAYTAkVTMREwDwYD VQQIDAhHaXB1emtvYTERMA8GA1UEBwwIRG9ub3N0aWExPjA8BgNVBAoMNUhpVFog Q2VudGVyLCBVbml2ZXJzaXR5IG9mIHRoZSBCYXNxdWUgQ291bnRyeSBVUFYvRUhV MRkwFwYDVQQDDBBjbGFyaWFoLmhpdHouZXVzMSUwIwYJKoZIhvcNAQkBFhZ4YWJp ZXIuZ29lbmFnYUBlaHUuZXVzMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKC AYEA30u764MqnMkUEHxZbL62J4RI3IhJ0oanCuMuZSMgMeYHN/MJdqnK971bAeTQ NHPaQQyKO0HVjkqSR95Ag5d5MRdnzm7qDyVmD0SfEcVMcCVVqnnFDgKWkhe9GaRz y7xPNQGwYDF7WSboozzY3a2W73QHmVG23h0YtdLj/pHz4fuNxq3WIQyYImViyGSB UCndpOXCCnVCWbTbULM6hh0GcoyxpeOu0WBX6WNNkLP5Hm5ZhGNdRs9au0fLk2Vo iooKFKphL1HVFwZrI5+lWqTGEJdr9zZLCagmnXTS4yGOPOx9ssQgdaB6NEJeUiVE Yta89hPJzyRzodLzH8wILov7b97/wh+cPG/48SXmxsuYRShxa3e1LU0Nd/XKFgy0 81+cg3XzV6J+4JNDdR6uPb3+vjTO2hc7l/dJhIsxq3Ac5t5Bvwipk5g+WqXmMdHx dtnL+OdjF+vFliVJQ5WLfB/G7ekXCv6wrFEHyC7HM77lsFEUA/bQUjfeoypEDufn tH01AgMBAAGjUzBRMB0GA1UdDgQWBBTvOKA1cC5Ww16NQeCPQnSVXORZrTAfBgNV HSMEGDAWgBTvOKA1cC5Ww16NQeCPQnSVXORZrTAPBgNVHRMBAf8EBTADAQH/MA0G CSqGSIb3DQEBCwUAA4IBgQCE2BuZg3hTUmsLBDWj6oAWdJkK8gUjqO0ZaTCoaedh 59mQSeDuNpsZiOXy+SDDDRZjeTEfJkSLZ+Iqte2iT6TGuE2XyJ/7VYyRHqAyjH1p WXZMZ888IAkWRslPVUeoP/VCPR0wSscba4BqTstdnxmrd3VHGJOR49yszB/KDfCH bQ8KG2Ki8fv0ba1nSEXti+fBMEHcJwRxDnXbIxQh3W80VUvTpohpjmIDsjOw8Y8w 1vF7JrFdAZdq0abDdZ3Atz86Wb0s510hZ9ktEXMkFpH5A/gpiyGITNxr0+9kRqNh 7hKlH3RmWdFRkC9dkWv/kLHdXniajc/Bjc+jvRwc+p4yICAub6RWnItorXIyms4X Ocd7P3diNpXjsycSD+/5oRnIZeRqYjo1uXT8qYUtstbZo496sawbpS/A+x9UbhB6 dQ8Me1+5ySmj9XLW+MkveqG6yDBshCjrHq4ysmks+CfHn+M57NAZ6lUFvWhA6wSa e0JWRqlokBOaIj4Q2WeSXFE=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIFTTCCA7WgAwIBAgIUUVsjdlv+p9QcTzTICnwxiuk8RecwDQYJKoZIhvcNAQELBQAwgbUxCzAJBgNVBAYTAkVTMREwDwYDVQQIDAhHaXB1emtvYTERMA8GA1UEBwwIRG9ub3N0aWExPjA8BgNVBAoMNUhpVFogQ2VudGVyLCBVbml2ZXJzaXR5IG9mIHRoZSBCYXNxdWUgQ291bnRyeSBVUFYvRUhVMRkwFwYDVQQDDBBjbGFyaWFoLmhpdHouZXVzMSUwIwYJKoZIhvcNAQkBFhZ4YWJpZXIuZ29lbmFnYUBlaHUuZXVzMB4XDTI0MTEwODA4NDAxM1oXDTM0MTEwNjA4NDAxM1owgbUxCzAJBgNVBAYTAkVTMREwDwYDVQQIDAhHaXB1emtvYTERMA8GA1UEBwwIRG9ub3N0aWExPjA8BgNVBAoMNUhpVFogQ2VudGVyLCBVbml2ZXJzaXR5IG9mIHRoZSBCYXNxdWUgQ291bnRyeSBVUFYvRUhVMRkwFwYDVQQDDBBjbGFyaWFoLmhpdHouZXVzMSUwIwYJKoZIhvcNAQkBFhZ4YWJpZXIuZ29lbmFnYUBlaHUuZXVzMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA30u764MqnMkUEHxZbL62J4RI3IhJ0oanCuMuZSMgMeYHN/MJdqnK971bAeTQNHPaQQyKO0HVjkqSR95Ag5d5MRdnzm7qDyVmD0SfEcVMcCVVqnnFDgKWkhe9GaRzy7xPNQGwYDF7WSboozzY3a2W73QHmVG23h0YtdLj/pHz4fuNxq3WIQyYImViyGSBUCndpOXCCnVCWbTbULM6hh0GcoyxpeOu0WBX6WNNkLP5Hm5ZhGNdRs9au0fLk2VoiooKFKphL1HVFwZrI5+lWqTGEJdr9zZLCagmnXTS4yGOPOx9ssQgdaB6NEJeUiVEYta89hPJzyRzodLzH8wILov7b97/wh+cPG/48SXmxsuYRShxa3e1LU0Nd/XKFgy081+cg3XzV6J+4JNDdR6uPb3+vjTO2hc7l/dJhIsxq3Ac5t5Bvwipk5g+WqXmMdHxdtnL+OdjF+vFliVJQ5WLfB/G7ekXCv6wrFEHyC7HM77lsFEUA/bQUjfeoypEDufntH01AgMBAAGjUzBRMB0GA1UdDgQWBBTvOKA1cC5Ww16NQeCPQnSVXORZrTAfBgNVHSMEGDAWgBTvOKA1cC5Ww16NQeCPQnSVXORZrTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBgQCE2BuZg3hTUmsLBDWj6oAWdJkK8gUjqO0ZaTCoaedh59mQSeDuNpsZiOXy+SDDDRZjeTEfJkSLZ+Iqte2iT6TGuE2XyJ/7VYyRHqAyjH1pWXZMZ888IAkWRslPVUeoP/VCPR0wSscba4BqTstdnxmrd3VHGJOR49yszB/KDfCHbQ8KG2Ki8fv0ba1nSEXti+fBMEHcJwRxDnXbIxQh3W80VUvTpohpjmIDsjOw8Y8w1vF7JrFdAZdq0abDdZ3Atz86Wb0s510hZ9ktEXMkFpH5A/gpiyGITNxr0+9kRqNh7hKlH3RmWdFRkC9dkWv/kLHdXniajc/Bjc+jvRwc+p4yICAub6RWnItorXIyms4XOcd7P3diNpXjsycSD+/5oRnIZeRqYjo1uXT8qYUtstbZo496sawbpS/A+x9UbhB6dQ8Me1+5ySmj9XLW+MkveqG6yDBshCjrHq4ysmks+CfHn+M57NAZ6lUFvWhA6wSae0JWRqlokBOaIj4Q2WeSXFE=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clariah.hitz.eus/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clariah.hitz.eus/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clariah.hitz.eus/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clariah.hitz.eus/Shibboleth.sso/SLO/Artifact"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clariah.hitz.eus/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clariah.hitz.eus/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clariah.hitz.eus/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clariah.hitz.eus/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AttributeConsumingService index="0">
+    <AttributeConsumingService index="1">
       <ServiceName xml:lang="en">HiTZ / CLARIAH-ES Repository</ServiceName>
-      <ServiceName xml:lang="nl">HiTZ / CLARIAH-ES Repository</ServiceName>
-      <ServiceDescription xml:lang="en">Various services provided by the HiTZ Center (UPV/EHU) in the context of CLARIAH-ES.</ServiceDescription>
-      <ServiceDescription xml:lang="nl">Various services provided by the HiTZ Center (UPV/EHU) in the context of CLARIAH-ES.</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonTargetedID"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:mail"/>
+      <ServiceDescription xml:lang="en">Various services provided by HiTZ Center (University of the Basque Country, UPV/EHU) in the context of the CLARIAH-ES initiative.</ServiceDescription>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationName xml:lang="nl">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="en">HiTZ Center, University of the Basque Country UPV/EHU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">HiTZ center</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.hitz.eus</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>German</GivenName>