--- SURFconext/https%3A%2F%2Finventory.clarin.gr%2Fsamlbridge2%2Fmodule.php%2Fsaml%2Fsp%2Fmetadata.php%2Fdefault-sp.xml
+++ CLARIN IdP/https%3A%2F%2Finventory.clarin.gr%2Fsamlbridge2%2Fmodule.php%2Fsaml%2Fsp%2Fmetadata.php%2Fdefault-sp.xml
@@ -1,24 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://inventory.clarin.gr/samlbridge2/module.php/saml/sp/metadata.php/default-sp" validUntil="2025-05-03T00:10:03.176446Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://inventory.clarin.gr/samlbridge2/module.php/saml/sp/metadata.php/default-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/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">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
         <DisplayName xml:lang="en">CLARIN:EL</DisplayName>
-        <DisplayName xml:lang="nl">CLARIN:EL</DisplayName>
         <Description xml:lang="en">CLARIN:EL is the National Infrastructure for Language Resources and Technologies in Greece</Description>
-        <Description xml:lang="nl">CLARIN:EL is the National Infrastructure for Language Resources and Technologies in Greece</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/clarinel.png</Logo>
+        <InformationURL xml:lang="en">https://www.clarin.gr/en</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://www.clarin.gr/el/content/privacy-policy</PrivacyStatementURL>
+        <Logo height="214" width="500">https://www.clarin.gr/sites/default/files/logo_clarinel.png</Logo>
       </UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
+          <X509SubjectName>CN=inventory.clarin.gr</X509SubjectName>
           <X509Certificate>MIIEpzCCAw+gAwIBAgIUB5FJvts3IF5U2rg9ScdiVl7njowwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEcMBoGA1UEAwwTaW52ZW50b3J5LmNsYXJpbi5ncjAeFw0yMTA3MjkxNDUwNDJaFw0zMTA3MjkxNDUwNDJaMGMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2ludmVudG9yeS5jbGFyaW4uZ3IwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDFB38BygQ7rVt0JdRQorXjyBEa0nhNLHJvj0PGbfOUXwD0+ylnqGax50mNqSo217o+25QHWP+OPiUG9YNlgcWzmuoHaBcrnofnN4E/y6XlSEFkEcRFBwCAG85CpV6UHlCcj2i/4MBZVRnNqUU0B/KOrtuAt8l72Nm6C5Gq03N98N54nbWDi94Gs44DKoDySl/o7UamnKubXk7bTCTohMs7dVXbRL13YS7AJcEGi/T+gqRrcLHtgSXwE8VsTFme8KbXH1HaBcNAJv6bl+3fHWxBsomAApNy/FIMtd04dWN3xyn2k2k6Pc2yT1fIhCdAIbb9d5xvyDvBqGHfztvg4HV9dciqrun/X1iMHPDO39gl7TIZRMpi8VsyghvFepEL6jaX0zlxmSfLD3VC/G+cuc3PWvq725UMxSSKzpZU2Ies0UiTc6mDoo1xWMVwMfHQWUUYNwKT+CwDgqF9VCAOyHsrUTkS3yTvzm1ZPkpjsXmaknzuvnD0xL/M1C3Tl28jHFMCAwEAAaNTMFEwHQYDVR0OBBYEFM45ilwRp6ZI9nE++6I+1eO8Xd79MB8GA1UdIwQYMBaAFM45ilwRp6ZI9nE++6I+1eO8Xd79MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBAChuoL7+l84hTTJy2REvwPklpmFzCEyCBfzip4SsbZbpyQsoN55/TE6GGUHZtomCo0O+dsl0BIB/22t6FAtG1sVn0WhPKXQEHVat64JVWj1nogzLNxj6KIMT/Lc23tqRaT8uyK1exErqbW5N2XMLHTUSkkIM5kd16jw/hLUbg7X7C6bWmTnW9IEGzIYQmoPCRb882IBkkeE/VUSp42jC3YKrnxSzu2Z1KNYyw4y6/fzi67LGNjTKrWt4czEauZ33tNMrwi803Kn/cHjFdfAC82caxuAtVo7KxohdIW6sPzkl1lvm8WpBaJlKE3cRUv3zhxJiusxKBOio6/ofYPNzHd4kLbpLBaqRaw2SRYuyDu+xoRIk43jExr4f1OK07pNDrdyxmykWQBfxnEbZXwx50v2XeQpejemDriiPlB3mDAG07HDhNaGek1a11sghBwwwWub0rsiwyxDjNZRKIVe7GxCeCvrRVY6vho55ki1zsjx7zRsfaeKMXlCvvC1HwNAOHQ==</X509Certificate>
         </X509Data>
       </KeyInfo>
@@ -26,31 +30,35 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
+          <X509SubjectName>CN=inventory.clarin.gr</X509SubjectName>
           <X509Certificate>MIIEpzCCAw+gAwIBAgIUB5FJvts3IF5U2rg9ScdiVl7njowwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEcMBoGA1UEAwwTaW52ZW50b3J5LmNsYXJpbi5ncjAeFw0yMTA3MjkxNDUwNDJaFw0zMTA3MjkxNDUwNDJaMGMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2ludmVudG9yeS5jbGFyaW4uZ3IwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDFB38BygQ7rVt0JdRQorXjyBEa0nhNLHJvj0PGbfOUXwD0+ylnqGax50mNqSo217o+25QHWP+OPiUG9YNlgcWzmuoHaBcrnofnN4E/y6XlSEFkEcRFBwCAG85CpV6UHlCcj2i/4MBZVRnNqUU0B/KOrtuAt8l72Nm6C5Gq03N98N54nbWDi94Gs44DKoDySl/o7UamnKubXk7bTCTohMs7dVXbRL13YS7AJcEGi/T+gqRrcLHtgSXwE8VsTFme8KbXH1HaBcNAJv6bl+3fHWxBsomAApNy/FIMtd04dWN3xyn2k2k6Pc2yT1fIhCdAIbb9d5xvyDvBqGHfztvg4HV9dciqrun/X1iMHPDO39gl7TIZRMpi8VsyghvFepEL6jaX0zlxmSfLD3VC/G+cuc3PWvq725UMxSSKzpZU2Ies0UiTc6mDoo1xWMVwMfHQWUUYNwKT+CwDgqF9VCAOyHsrUTkS3yTvzm1ZPkpjsXmaknzuvnD0xL/M1C3Tl28jHFMCAwEAAaNTMFEwHQYDVR0OBBYEFM45ilwRp6ZI9nE++6I+1eO8Xd79MB8GA1UdIwQYMBaAFM45ilwRp6ZI9nE++6I+1eO8Xd79MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBAChuoL7+l84hTTJy2REvwPklpmFzCEyCBfzip4SsbZbpyQsoN55/TE6GGUHZtomCo0O+dsl0BIB/22t6FAtG1sVn0WhPKXQEHVat64JVWj1nogzLNxj6KIMT/Lc23tqRaT8uyK1exErqbW5N2XMLHTUSkkIM5kd16jw/hLUbg7X7C6bWmTnW9IEGzIYQmoPCRb882IBkkeE/VUSp42jC3YKrnxSzu2Z1KNYyw4y6/fzi67LGNjTKrWt4czEauZ33tNMrwi803Kn/cHjFdfAC82caxuAtVo7KxohdIW6sPzkl1lvm8WpBaJlKE3cRUv3zhxJiusxKBOio6/ofYPNzHd4kLbpLBaqRaw2SRYuyDu+xoRIk43jExr4f1OK07pNDrdyxmykWQBfxnEbZXwx50v2XeQpejemDriiPlB3mDAG07HDhNaGek1a11sghBwwwWub0rsiwyxDjNZRKIVe7GxCeCvrRVY6vho55ki1zsjx7zRsfaeKMXlCvvC1HwNAOHQ==</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://inventory.clarin.gr/samlbridge2/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://inventory.clarin.gr/samlbridge2/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://inventory.clarin.gr/samlbridge2/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inventory.clarin.gr/samlbridge2/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://inventory.clarin.gr/samlbridge2/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">CLARIN:EL</ServiceName>
-      <ServiceName xml:lang="nl">CLARIN:EL</ServiceName>
-      <ServiceDescription xml:lang="en">CLARIN:EL is the National Infrastructure for Language Resources and Technologies in Greece</ServiceDescription>
-      <ServiceDescription xml:lang="nl">CLARIN:EL is the National Infrastructure for Language Resources and Technologies in Greece</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:givenName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:mail"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:sn"/>
+      <ServiceName xml:lang="en">CLARIN:EL (www.clarin.gr)</ServiceName>
+      <ServiceName xml:lang="el">CLARIN:EL (www.clarin.gr)</ServiceName>
+      <ServiceDescription xml:lang="en">CLARIN:EL</ServiceDescription>
+      <ServiceDescription xml:lang="el">CLARIN:EL</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="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="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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">CLARIN ERIC</OrganizationName>
-    <OrganizationName xml:lang="nl">CLARIN ERIC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
-    <OrganizationURL xml:lang="nl">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="en">CLARIN:EL</OrganizationName>
+    <OrganizationName xml:lang="el">CLARIN:EL</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CLARIN:EL</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">CLARIN:EL</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://inventory.clarin.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">https://inventory.clarin.gr/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Dimitris</GivenName>