Moved release-check to new host with new certs + added cocov2-test

16 files changed, 1542 insertions, 759 deletions

diff --git a/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml b/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
index 11a73bab..920aeb66 100644
--- a/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://anonymous.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = https://refeds.org/category/anonymous-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://anonymous.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://anonymous.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://anonymous.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://anonymous.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://anonymous.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://anonymous.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Anonymous</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Anonymous</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Anonymous</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Anonymous</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -126,8 +144,8 @@ rtSd5rXgy930PQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml b/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
index 706cff2d..6d1dcb2c 100644
--- a/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://assurance.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = Code of Conduct from SWAMID SP, RAF tests-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://assurance.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://assurance.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://assurance.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://assurance.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://assurance.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://assurance.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Assurance Framework</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Assurance Framework</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Assurance Framework</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Assurance Framework</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -125,15 +143,15 @@ rtSd5rXgy930PQ==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
index 8a281c96..faba94d6 100644
--- a/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov1-1.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 1-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-1.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-1.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-1.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-1.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-1.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-1.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 1</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 1</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 1</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 1</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -125,28 +143,28 @@ rtSd5rXgy930PQ==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</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="eduPersonUniqueID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="cn" Name="urn:oid:2.5.4.3" 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="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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" 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="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="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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" 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="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:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
index 255cb160..89613b5c 100644
--- a/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov1-2.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 2-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-2.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-2.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-2.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-2.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-2.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-2.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 2</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 2</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 2</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 2</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -125,26 +143,26 @@ rtSd5rXgy930PQ==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="eduPersonUniqueID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md: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"/>
-      <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="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" 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="o" Name="urn:oid:2.5.4.10" 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="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
index 719cd90a..220f7bcf 100644
--- a/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov1-3.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = Code of Conduct from non SWAMID SP-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/loop" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="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">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-3.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-3.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-3.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-3.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov1-3.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov1-3.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 3</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 3</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 3</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 3</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -125,22 +143,22 @@ rtSd5rXgy930PQ==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</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="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="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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="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="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:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
new file mode 100644
index 00000000..e59cebb8
--- /dev/null
+++ b/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov2-1.release-check.swamid.se/shibboleth">
+  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 1-->
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-07-04T08:35:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="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">
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>pairwise-id</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 1</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 1</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
+</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://cocov2-1.release-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cocov2-1.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Release-check for SWAMID</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" 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="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="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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" 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="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:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.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>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
new file mode 100644
index 00000000..c6b1ef12
--- /dev/null
+++ b/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov2-2.release-check.swamid.se/shibboleth">
+  <!-- Test with SP with EC = Code of Conduct from SWAMID SP, part 2-->
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-07-04T08:35:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="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">
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>subject-id</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 2</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 2</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
+</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://cocov2-2.release-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cocov2-2.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Release-check for SWAMID</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" 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="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.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>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml b/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
new file mode 100644
index 00000000..df77eed5
--- /dev/null
+++ b/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cocov2-3.release-check.swamid.se/shibboleth">
+  <!-- Test with SP with EC = Code of Conduct from non SWAMID SP-->
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-07-04T08:35:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="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">
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>any</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" 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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - GÉANT CoCo part 3</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - GÉANT CoCo del 3</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
+</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://cocov2-3.release-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cocov2-3.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Release-check for SWAMID</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="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="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:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SWAMID Operations</md:GivenName>
+    <md:EmailAddress>mailto:operations@swamid.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>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml b/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
index a991c7dd..9713b7de 100644
--- a/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://esi.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = https://myacademicid.org/entity-categories/esi-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,86 +18,107 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="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">
         <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:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://esi.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://esi.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://esi.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://esi.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://esi.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://esi.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - European Student Identifier</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - European Student Identifier</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - European Student Identifier</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - European Student Identifier</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -132,8 +150,8 @@ rtSd5rXgy930PQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml b/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
index 922e807b..fc3fd845 100644
--- a/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mfa.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = Code of Conduct from SWAMID SP, MFA tests-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Assurance Framework</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Assurance Framework</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - MFA</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - MFA</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -125,15 +143,15 @@ rtSd5rXgy930PQ==
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml b/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
index f08fa928..3abe666c 100644
--- a/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://noec.release-check.swamid.se/shibboleth">
   <!-- Test with SP without any EC -->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,80 +18,101 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://noec.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://noec.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://noec.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://noec.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://noec.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://noec.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - No EC</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - No EC</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - No EC</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - No EC</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -121,8 +139,8 @@ rtSd5rXgy930PQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml b/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
index 9ab09971..60d07b6f 100644
--- a/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://personalized.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = https://refeds.org/category/personalized-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://personalized.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://personalized.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://personalized.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://personalized.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://personalized.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://personalized.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Personalized</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Personalized</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Personalized</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Personalized</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -126,8 +144,8 @@ rtSd5rXgy930PQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml b/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
index 30c877e5..5f6759ff 100644
--- a/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://pseudonymous.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = https://refeds.org/category/pseudonymous-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pseudonymous.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pseudonymous.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pseudonymous.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pseudonymous.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://pseudonymous.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pseudonymous.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Pseudonymous</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Pseudonymous</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS Pseudonymous</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS Pseudonymous</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -126,8 +144,8 @@ rtSd5rXgy930PQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml b/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
index 6a995a49..f5bb9763 100644
--- a/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
@@ -2,9 +2,6 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://rands.release-check.swamid.se/shibboleth">
   <!-- Test with SP with EC = Research and Scholarship-->
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -21,85 +18,106 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-19T15:49:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rands.release-check.swamid.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rands.release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rands.release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rands.release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://rands.release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rands.release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS R and S</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS R and S</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check - REFEDS R and S</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check - REFEDS R and S</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="sv">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -126,8 +144,8 @@ rtSd5rXgy930PQ==
   <md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/release-check.swamid.se-shibboleth.xml b/swamid-2.0/release-check.swamid.se-shibboleth.xml
index e05f873a..f05f125d 100644
--- a/swamid-2.0/release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/release-check.swamid.se-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://release-check.swamid.se/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-11T11:57:38Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <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"/>
@@ -20,8 +17,11 @@
     <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-11T11:57:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
@@ -31,83 +31,93 @@
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://release-check.swamid.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://release-check.swamid.se/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://release-check.swamid.se/Shibboleth.sso/DS/nordu.net"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://release-check.swamid.se/Shibboleth.sso/DS/nordu.net" index="2"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://release-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="3"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://release-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="2"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://release-check.swamid.se/Shibboleth.sso/DS/seamless-access"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="4"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://release-check.swamid.se/Shibboleth.sso/DS/seamless-access" index="3"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
         <mdui:Description xml:lang="en">This is a test service for Identity Provider administrators to test that they follow the SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Detta är en testtjänst avsedd för systemadministratörer med identitetsutgivare registrerade i SWAMID. Tjänsten testar om identitetsutfärdaren följer SWAMID Best Current Practice for Entity Category Attribute Release.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SWAMID Entity Category Release Check</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SWAMID Entity Category Release Check</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://release-check.swamid.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="115" xml:lang="en">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://release-check.swamid.se/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUVLubTApZL2saWYLEDnANQ2IlVZwwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMVoXDTI5
-MTAxNDIwMjczMVowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEAqjbqLKcx/P9wAjFXioquaT/+Xc49fEXzKKe/
-/mpulp7/PLgPGlhh7xoELq3bDG0MKr1P6rI+LGyhuUEN7GJaQL6AoYklOB6Vzss4
-Q6L599oo67mSrtIofJuVxhC1xZBUwaTXE0nBrnSWaoXRqxuBrdK9jkcb46tDLSYW
-2ZLEjyi6VZKIa9GfE/VY0houKBUDbBZ6tIfGgghdN8LwP6bqt7aYM8pLzunT5Lzc
-qtmTxeIXAxTv0pXtn8FEeiL7VWaVahbGftM+caZdgeSOAROfRd9bY9m8p947WLQi
-95GOiVZi67Q1DPGN7RVFcqf4p/XG3JbL9gbHp2iUg+ZpiHoPceAlgJ2mLX1Dd5bg
-fhhakatd4n/iGbyJ11/1DLIHs4ZnamKJmBfm3HSeKqm/NypHB3yEH9Hmb8YFiI6t
-+z+xV9BPO1V4wjf4eWZ2qHoh+LTM3ACaBRGXfnhPZ9+NHXOdTw21ISRD/IT1B2wU
-X5XjWPoiJEcbgtl70RE75jmtKTuJAgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUSNJ0a4YZc9dSPseR3mwnyDI+MwEwDQYJKoZIhvcN
-AQELBQADggGBAEUacJEitgrF/UH670StEcRkKE0bccxzUZOy/TPRyjaJwhuFYbTZ
-fbLK9JB/7QTdI0S4XNNyVIFS+v1089C33GaFzHqIdnTwlPtuaTL5V9h0ew9W8B5i
-l/uyi7WM+Ij3wrm2JEbpUgLNDKRu87wl4TuCU+SqJafsC2t9z1Q8molPUh2sQ7ci
-6QaLvHBSehU2sVChYonq3rlkP37KPrzHUza/ZH8U6SWRkJC8zb4jzw0i1RWZnMyT
-l7TbjEQN53ES6jlX+Rj/wLFRpCURcJRcoEIrBqVMmyyM+RegscFCbSqO1PVHCDbM
-lHGqMElLpJ1KSAA4y+4zfU4WbSno850PQlZ2KDEHbEsb/k7NI59D+0hUhNBfP2fc
-Ccma1I451Mf1ANzrFCniqUXbre5nqNGQHuVrtk7cMUYyt4bv8rCkYQP0J6a+HYw8
-LoEDqj2cS1ZW7uhbCJrHuAkGGgBrd+l6OCiMVpqBC+AJT/zTeFHLSKXl/TuR/v1e
-KK/Bciw51EZ7Ew==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUGZLlVQ7uTEGlHeuHGjnDuUAbhMcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJx9KHev
++KNPo0kGHnwzyk4V1ye8ZxSy9GR1QqAtsg3C6ObDf8Zc8Xak1c8niWqIET0NjdXV
+9CImXFBqiViIoEfDsv2HYCfflbQeGUPm1dZINdUvjE0ImqYOpOIrPf9+ewJW1NE0
+jdksHCa5Kb2f0JITuF2DJoNXJA3iq07iLo81ZghdozQPQiiVktnnYH3ziuIB1OBE
+DKNBD/kCAUZs+4TICN8SzCW13oXlgEfn+WVG76D95V/zdEHXO+18ktl8o4G/x/4h
+zuhu9gnp2k38+UibXl5rfQOgG4W4Xf7yf4Ev9VxTtbCXX5mJN5q7ymZeZg85EuTf
++gDFmJ1yYj82EtJQoNQHq4SuR6oWxnV3Gpe5hX8TJB5KaDaeLMpPnynRT83NhQ+l
+L74gEooEet8uhfAaUS/QFHYHtue4QjdMhOKRr+px0EnMAYAkL/a7QoUDkoF+Uiaw
+R3ZnrqP4mlja6TNluXaNYClP1r1QZFLkXISl+jVjz9spJiuoLrd5qyWHcw6WoqPT
+iSBM4dHWgRSNAUEE3KE6PdZKB6QYmd+4sbnenHFpv/0JTyiz4W/OtujzaW7nINAl
+q/vtv58MxN0z3Lo+soqYyCCGzBSmM93FGs1EdjJBapO1DWRpK3OJ1SD/Vd7/a4Yb
+YqF9vls3IqzzI6/KuhC7Ln03q9UbsDcgd5xlAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBQbU2ryATd41HCxSKj/
+jRbnr9QNoDANBgkqhkiG9w0BAQsFAAOCAgEAlZCv03aX6k3705AmjW3jEOwhq+6Y
+ceALENoDoaqCatDtzEpsXwuM7VK+Bkr893mgGFU45GayIMDvCPikVENo9Y2jHGhr
+bMUJcHPQUDEWPUndwDcxMcvbw5RrMFncfiksDTI/H1nZT5xzDspIns3ziTiVKg0n
+mw62aLIMawmleqP93AgJ3A4GSmklA6+rSa96/Aw/Rf2MGDe2b3CfBrjj5OFQu6Qf
+huW2+c6q+qJmhcY5xu3qdtnhTE3ndUPkSRNBcRV5129CpwZ9oZ2gZpfvRkmoJFE4
+RAi555XnduQkRrftB7Cdj/pspoF+4PfyTtnlrxm2Dds8AwNwlWzvg6tYmlDy6ZLD
+5z+McekKF2R28pbVpd4rI32D+h0mpDLsc3rlhH7qn2rOoIKfOOSGURVWFwbIi/Qi
+GxR64BtHHGjMMdOb5B27Rudw/pifzj/eRueDV4hM5xGY3FtyB5nPpia5kQjx4qEo
++ZmwKbmR5RnyQ9Gt0W9XBmafWinhoeiUYrw2/hGGlOGKUp0dbnGmoY7dKLuVB6Cl
+B3ueMq7hBEPvSPDa1xUKJ6ZalS1rwDwET7jRaueC0E59HLAVyRF0ZeC+n7lTzUez
+TAmqiu49Fkne+ti/T3CI+FgG8fof2byidIbFNYELZWQgA2Wa07SOTSGeDrIcmAW1
+h6xrfpon4qdarT0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>3b2548e9acf6</ds:KeyName>
+        <ds:KeyName>release-check.swamid.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=3b2548e9acf6</ds:X509SubjectName>
-          <ds:X509Certificate>MIID9jCCAl6gAwIBAgIUAQvlKdIv0wTBgd8wnoQ4DMBVuv4wDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MB4XDTE5MTAxNzIwMjczMloXDTI5
-MTAxNDIwMjczMlowFzEVMBMGA1UEAxMMM2IyNTQ4ZTlhY2Y2MIIBojANBgkqhkiG
-9w0BAQEFAAOCAY8AMIIBigKCAYEArkGRHvmLAaHApuzIaKg9tXjyDuBBC6dtGPvf
-iOCuGSO7FcfwWBmmeQ3qQdIOj++ecAfIIsArWtFmH4CX6o7EbJfKPfPCjeyLwSAP
-TRLJQ0sj8FTPdVIXeKMK6KdOiLyI2cLHvVIJ2Ct63SbWuoHqMMT5BnGl5ZUYpbwm
-yFcb2WkadRzfulrDy6UqsoZrXawzCmnFJtmwBuh+TbM1VWS290bDLL3raAKSl7KY
-aGk7rcfe8cXAEX1Ou8nBxWe9OFoki1HytqK20Tc8vACGVqkbRA7QXtYS5uj0Ym5J
-nj3BFYfkTLkElw1vLRthCjQ2/4p3R/CJQdvQ7CVLAQJYempX/r+TL/rH2OjIMS8I
-wt2niE+XxfuMs9EsAUHlG4FU2smdHGdTQ6FD5INUB6OWOuFtCcHCZewkqomXh/DQ
-GkHfKwuM8mExYMV9aROTY0lc73E/pPeQiOfaZQAFWnCdRtGBMzHEMRgyVyTzT0ZM
-fy6M7Z7ZMSrX9AzAhwGPul5JdlI3AgMBAAGjOjA4MBcGA1UdEQQQMA6CDDNiMjU0
-OGU5YWNmNjAdBgNVHQ4EFgQUBrd0LadG54fHunxCfaqmNsUQrhowDQYJKoZIhvcN
-AQELBQADggGBAJH1qvbnXW3CTfJSwt3rdK7iu7wtnTTUltTtQWZO7JNos5QEYltW
-/XlvqoEk/0a7oeWjv8lQ2I3wtL3Hk93nxzjAWKavKEFKfw/12ryhgF1wRYtdmiLO
-8NTV+y21z3sdGjkDzDr61dLYO2k6DRgVkEDkkC6SzV7CnxB4xQlfH7ZbUiIPLcnO
-PXuUkV962ifnenos/XAICroOg8MSe8HJOzisngnbfVLrV59JCXBFkjTMVdtfj2oY
-RgIJCBe+ZTO5ZyjP5SA/WA+R7/PTDJkcPnUEpXU3RrPkvxeO2i5ED+FDKn/qwTUi
-CJgz70bIWAPKvqbylF2/PGxnQplF4k5MOOPxgBQi7SN76TfwCj8yGDL9jHHLyeNC
-b/uFMt24uGhuR2Lj6EQSTjXr3MwyN8OI0mTMUsc4CZsWiKRUsAGZ+H9/2feChOUO
-2xgD+4RpO5RQYVqnCOalXlyxlo1YvEc3KahBPwCwnXcWjdU7VJ7pcXfaQFb/uA8v
-rtSd5rXgy930PQ==
+          <ds:X509SubjectName>CN=release-check.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUQ+3ByPKW+MpUKh+52zwsWvbVqLcwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAxMXcmVsZWFzZS1jaGVjay5zd2FtaWQuc2UwHhcNMjIwNzAx
+MDgzMjU4WhcNMzIwNjI4MDgzMjU4WjAiMSAwHgYDVQQDExdyZWxlYXNlLWNoZWNr
+LnN3YW1pZC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALO9yFoT
+yA/iJv4qzBpL/KzROnLAFWYdC4fGxQfwT7HCdKFk35h6QVl8YtwgP3EvZTN77elX
+/kXh7kxP+zwbvwrQXlJeoFHFUmYH9Qu9Ejs7tJb+AqWFFIs3/CauEk2qnw8/DfVW
+cAY9jXsY/MgNjjtO4F8tA60UdlL4VYc1dDuYVJvDRncGH2MrrIskJ79Pf5mhECoo
+fplDsi447JTADioWz5oKu0OmzCKD7EApt1KUXB5UDd1NXIcSfD/QH2p+hphbCBL5
+6Jd5mLSxqylLflG1dXzoQPf+biNgghP4IjtSt+TECnbzTLOcrZYrpHWWhOTei3+H
+WxqdF5NhYwKL5syK3ycEAOuenf3AEEsLlmX80A7HFwIFQlQdCcv6tR95aq5xQXyX
+ihSFbx8oJ0JYO10+6me4SvQ/3FN9WYRZz76rM1JiAKD3uxXC4vhsLAEkSap3phE1
+Y5jCwRXP/i/eBqZ5OyEIOYf0OqVJBjLjLJcNjVFLgn2R22rN4H+eGk6++vqyOTMu
+KMYSXVHvzSmRXJaqdsSYYA+92nPvKg5//kjldplyDZ6NdJIVqkVOBq5ziee60hQm
++L5joqosfJ0yXJJvq6MQgXrVLjfqHCRcSD2bleubrY2Y27S134jk59fpczIlqTsE
+epuD3g8unj+ZFpmlag6yI6VMCKztFEwXKOgzAgMBAAGjRTBDMCIGA1UdEQQbMBmC
+F3JlbGVhc2UtY2hlY2suc3dhbWlkLnNlMB0GA1UdDgQWBBTHMQO9umbTE5hDulV+
+xwEkNqyS6TANBgkqhkiG9w0BAQsFAAOCAgEApbkKljjaOR1D/+9B6HfCy9eYyXOw
+GrhoMb8FAVXxpoVlUTEQqAzPcNi/D8jJVpYUBIg908tIl2qyTAYgzlHD7SiIh/P0
+HPBFdOR/YL2jY9T3lb9ZdCVQjBoBbAy/UTlUxZTZfT78L0cbPvSrfG0tK+e1dugd
+QbGv8nkeGA+F6YYtlRtiiyf25Hov/+eN0+Rzh9aSU/vFyw5Mzw2cT5h/3+UBOTAa
+lV7oB5Vwgsqzm7G6At4ftwfnuNdveHwRjBhNhiwiuFe1St+//7NrX8wFrztEC40q
+Alx6tAXZF7MuRq++w0L5xFpnKQZG8qg0b/iOS+BIqWEItI39XbJvnkAlk447Y3oc
+2s2A3F6FRTrghAAM788GZ5sSBn2IESTOAp2HkGJdMGrBfi6wygeXQQaarar2ruwr
+KISgbDg+2w4tnP3l6pIH3d2mlAbj0Ubhv5+8q+kukJ+/gpQhaMtAgIp/6i3kEkQV
+JbQ2kA+bERhoKXszGpwHb8rBslWNloOPkpsEKhqeR3lRQ6FEDoy2PwCz3ulIr9Vu
+Ao5BpXXeju6s7+XovTPuvmHeDHJE94H1br1dnW2uc21J2fxDCXTmjOZNebbv4I8Y
+BYaSPpUjtlSq2k22e/g3akDlsvxFg4xrVSgHc2bKo7YJjzBEhIdMvpQtstwty6Ch
+B74Mrn0TheZeZB4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -127,32 +137,33 @@ rtSd5rXgy930PQ==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://release-check.swamid.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://release-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://release-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://release-check.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Release-check for SWAMID</md:ServiceName>
       <md:ServiceName xml:lang="sv">Release-check for SWAMID</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="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <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="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="cn" Name="urn:oid:2.5.4.3" 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="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" 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="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="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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" 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="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" 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="o" Name="urn:oid:2.5.4.10" 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:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2838a5fa..b264b409 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -688,4 +688,7 @@
   <xi:include href="swamid-2.0/aktivera.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>