--- SURFconext/https%3A%2F%2Fb2access.eudat.eu%3A8443%2Funitygw%2Fsaml-sp-metadata.xml
+++ CLARIN IdP/https%3A%2F%2Fb2access.eudat.eu%3A8443%2Funitygw%2Fsaml-sp-metadata.xml
@@ -1,79 +1,66 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://b2access.eudat.eu:8443/unitygw/saml-sp-metadata" validUntil="2025-04-23T00:10:02.338519Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://b2access.eudat.eu:8443/unitygw/saml-sp-metadata">
   <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>
+    <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">EUDAT B2ACCESS</DisplayName>
-        <DisplayName xml:lang="nl">EUDAT B2ACCESS</DisplayName>
         <Description xml:lang="en">AAI for EUDAT B2-Services</Description>
-        <Description xml:lang="nl">AAI for EUDAT B2-Services</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/eduat.png</Logo>
+        <Logo height="16" width="16">https://b2access.eudat.eu/unitygw/VAADIN/files/logo-small.png</Logo>
+        <Logo height="146" width="146">https://b2access.eudat.eu/unitygw/VAADIN/files/logo-huge.png</Logo>
+        <InformationURL xml:lang="en">https://b2access.eudat.eu/unitygw/VAADIN/files/about-b2access.html</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://b2access.eudat.eu/unitygw/VAADIN/files/data-privacy-statement.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>b2access.eudat.eu</KeyName>
         <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
+          <X509SubjectName>CN=b2access.eudat.eu,O=CSC - Tieteen tietotekniikan keskus Oy,L=Espoo,C=FI</X509SubjectName>
+          <X509Certificate>MIIHpjCCBo6gAwIBAgIQBA2aBU1Sk+bZwPY5Ixr3nDANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xODA3MDUwMDAwMDBaFw0yMDA3MDkxMjAwMDBaMGoxCzAJBgNVBAYT AkZJMQ4wDAYDVQQHEwVFc3BvbzEvMC0GA1UEChMmQ1NDIC0gVGlldGVlbiB0aWV0 b3Rla25paWthbiBrZXNrdXMgT3kxGjAYBgNVBAMTEWIyYWNjZXNzLmV1ZGF0LmV1 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAy5yKdHUPFmaLq6cGyUDH SrM9zibkqX8s/FVdwwpnfJdl6abNquelP6/Td0mFIqu2XNyD0HzVUxZ+DZb25dOc wLqBGdpBdN8Z0faVsx3acwJXofium/7D/2xdyjC31LkQE7IyZcQZiB8qU8kNwRKD oBFiv6D2nYouRxDkXeqYnYnl70Of6+Nt/VwNtTrtcb/gS4BsMZtCRSM3VGcHjs2l fxF9imBmtcmM6p27U+QtoqQCcUgDojqUkJgVNo7+KrjjWfePBOpkWlMFqm+MV3Lb Hyngb9KB8MKXbOL5xsDBgn0u77voLIgsEBydlNwC5oAR0t2+lcoxPRPs4g7ZCCZN GgAG/gkMZ52i4B0JGonSAjB5lh4VOZkvRH6sv1ipzbJ3OQEm88zYUd01qSG2ljQl PCL63S/Sh+m4Z+YZN9Cb4UEgOOw/E3QJRpqGonOshAFwMrjjXZsxVcVdcN9Y6HpL xs0gnJS/M01+cL8H0oFmIyul3swXud1vNjwuCBj/dO+NuLXYFD+bZQaJ3i5TAgVP /2zexEwq8i1yQikijNI7VAkIQGSG5tdhqt7buk+np7j9EULmiaB/U0evMCHlCd2t ttCU5zhiFuwkHbG0oMCYB5LUoRTCSzUoNLD8bmEKIQb+ScYx4cwuQZqPBPdysHbJ cEeTybcY1GgIDv4IRP5F7+ECAwEAAaOCA0wwggNIMB8GA1UdIwQYMBaAFGf9iCAU J5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBSzYi6A2YUjF0CcM2eicXIHwORgMTAc BgNVHREEFTATghFiMmFjY2Vzcy5ldWRhdC5ldTAOBgNVHQ8BAf8EBAMCBaAwHQYD VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0 dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilo dHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAE RTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdp Y2VydC5jb20vQ1BTMAgGBmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUH MAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDov L2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/ BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIBagFoAHcA7ku9t3XOYLrhQmkfq+Ge ZqMPfl+wctiDAMR7iXqo/csAAAFkakBVGwAABAMASDBGAiEAqu6Y06tWu7sHInEW OyFWDxqqw/6iBsh5BWkmXHtGyDYCIQCj4n0I0xH24QR0dufxxEMQ7Ph3dth1pMcm BGstsvXvJAB2AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1YMG06v9eoIMPAAABZGpA VRoAAAQDAEcwRQIgeNkb8rxZbS+2f5jC+QRfVB90unsmxm8A3npObQaM4zkCIQCf V61dvZ8armVqOVlP4Hpn/VpV/T4rU1cn5m2HEB4csgB1ALvZ37wfinG1k5Qjl6qS e0c4V5UKq1LoGpCWZDaOHtGFAAABZGpAVTwAAAQDAEYwRAIgbyAdkqMNhUzvKegP MoF5WFODcg7B2EhO0h+y9Z5tsdACIDmAqGOgGQMIm+zB/CYHE5dAFpH7UTjRf7OV Eez3BbS+MA0GCSqGSIb3DQEBCwUAA4IBAQAwpJdt6ym1gp3v2MagSrZRSxSyir1n ZLIuZOiu1fVgqZbC922mb7pyIP7xVraAL5uhigJZN0O4/1CdYUOhncvWvNs/aKzG lS1VEcubk2STaTCPlocZ3awEGwvkOPHYDfEuhUckEJaHEMNhsWCbRz+ctYtYZK3H MDdLVFD81NaSKL3gcdUP7v06W2UlbixsDyyGx5Sv0WgxFXeNLWCbw0ISwI/5yZGh UYx2VarmFiLCDLaK3MWCtlaXXaRuaq1kdh/tUgS/ccqfXdLYsXziGYMVlsIWqD3B k9E9QwfR6b/E+kHMWiclonDWYOTmRktRi7F3PLf/Ke+tnARMLn2xTurX</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <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://b2access.eudat.eu/unitygw/spSAMLResponseConsumer" index="1"/>
-    <AttributeConsumingService index="0">
+    <AttributeConsumingService index="1">
       <ServiceName xml:lang="en">EUDAT B2ACCESS</ServiceName>
-      <ServiceName xml:lang="nl">EUDAT B2ACCESS</ServiceName>
       <ServiceDescription xml:lang="en">AAI for EUDAT B2-Services</ServiceDescription>
-      <ServiceDescription xml:lang="nl">AAI for EUDAT B2-Services</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:cn"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:mail"/>
-      <RequestedAttribute Name="urn:mace:terena.org:attribute-def:schacHomeOrganization"/>
+      <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="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="true"/>
+      <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"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationName>
-    <OrganizationName xml:lang="nl">Forschungszentrum Jülich GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
+    <OrganizationName xml:lang="en">EUDAT</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">EUDAT</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.eudat.eu/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>B2ACCESS</GivenName>
-    <SurName>Technical</SurName>
-    <EmailAddress>mailto:b2access@fz-juelich.de</EmailAddress>
+    <GivenName>EUDAT</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:b2access-support@eudat.eu</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <GivenName>B2ACCESS</GivenName>
+    <GivenName>EUDAT</GivenName>
     <SurName>Support</SurName>
-    <EmailAddress>mailto:b2access@fz-juelich.de</EmailAddress>
+    <EmailAddress>mailto:b2access-support@eudat.eu</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical"/>
-  <ContactPerson contactType="technical"/>
+  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <GivenName>Security Response</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:cert@fz-juelich.de</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>