Merge branch 'master' of git.swamid.se:swamid-metadatamd-2024-09-11-v01

10 files changed, 453 insertions, 112 deletions

diff --git a/metadata/swamid-2.0/dike.slu.se-shibboleth.xml b/metadata/swamid-2.0/dike.slu.se-shibboleth.xml
new file mode 100644
index 00000000..1e745c76
--- /dev/null
+++ b/metadata/swamid-2.0/dike.slu.se-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://dike.slu.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <samla:Attribute 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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-09-06T14:05:30Z">
+      <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>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">SLU service for distribution of geographical data</mdui:Description>
+        <mdui:Description xml:lang="sv">SLU:s tjänst för distribution av geografiska data</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SLU GET service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SLU GET service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://hades.slu.se/info_get.pdf</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://hades.slu.se/info_get.pdf</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://hades.slu.se/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://hades.slu.se/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE8zCCAtugAwIBAgIUavrvEy40V1txuC54lvufq24+ojYwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAxMLZGlrZS5zbHUuc2UwHhcNMjQwOTA2MTMyNjI3WhcNMzQw
+OTA0MTMyNjI3WjAWMRQwEgYDVQQDEwtkaWtlLnNsdS5zZTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAOhjDGbPasyRdzY6igQw6u++yKYPJ0A7eLFOZDrV
+/F9pf5LbmowZFrwd/0fNhkxvsnj2636fL1yGlRk9HuWSJZH6S9DMq1Aa3OWu2Lnq
+j0RFY+gFFJvN1NYk09cRKsENa/vJWCe/VP4PC7XfLxEkVo1tRS+XxTsK+XIB4OXz
+PXnZ9BuSgz/uUBEWIvoG6mD8SAvLD0jE/li3zNRUD6ZE9Sudl465aCJtHizvYvol
+tj0h1ZLXiebPCcWjWIYnGBLqtG2knC7T51IOfPvsq2RHBfg1ommgr6tbClcRNcfx
+9IO00Gqevvt73OQ4s8NhEwMb4Zsgq/s4nK4sWX8BoeolrLriULvCofR9Bxl2UZN1
+bk0ynJhccm7/Ma6Zg4gxYobfAMY/ZL343rHv8K9/G6Q0sNUQLBROVRuLEVJo6KG5
+aqvVcEqmOHTU9TlWWTxRcqNQUq6KN+v9dsfwKC8VEQvRjg+sV2BlHMo5GFGGA6q6
+o/Aa4uNEnOGMjfOrGwapvIL7wFivnafLHgAzcbxwCA+ZZtaQPfaqRBeRUhXk7HyZ
+4OmptarmQw8+yGLQ7WGW57s1XC3H57cxPDMZ3mClFT20Hf3NxHmR4fBlc7WVx4Xv
+2O9UNNT9I7sd+AarR5LGM9SHUEGt4MU2WktdmUMo81G4OyZVrd7mgtFR/UaRC6v1
+WcBlAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Rpa2Uuc2x1LnNlMB0GA1UdDgQWBBRp
+lorcEOeQf9ZyETDks27Ohyj0DjANBgkqhkiG9w0BAQsFAAOCAgEAtM66hvf+vL1b
+Vyl1AjQKNl94UcEEGbpsIzAKUNg/ualstM87ECBdynH/6f2WrjbtTPliZZkrqpgW
+z9FiFfs3QiH6aaDoDocgDH6hW8LddZ1HsIfSTNUYSA3pYNvuFJtaO7gPDsePOY3+
+incH+YgR8FWi/Vb8/6ywYhuMPC6nYQ+vRmn+zjXOv62NW0OGIJbYX55xtmUYR2xj
+U7VBqQZZ79hOex4ThNuuOo5r1FkTEn/kMYQ+KSVogQJLKBs3St/K4Gkk1N+mPsKY
+NflRBhjMIp7qkLLPCWvck1SmJXwYX0Hz7C/8E0MNQFRkYdwWjSfwMJDDt653jIyB
+NCQw69YRAt2ubbHTlO7rbAZ/QXnws//u/b5fCWMaQgGo12z18b47qWSvSYeh+TQ1
+a3Wf/wUPF033bN6ZvmzstwS2ziox2lmgVY7VzJfLAZI5eW44yleP2/3dFPYZJNos
+ziik1uyNuKHdeCd4YeanwY+JUyolgUPmIyHdOTs0zhzBYz6rAJh+CSlHyUevgSlp
+0A2VfWaid3SPSei/3C4oetkhjIcqaZfaxu91cucqtsDIHT0x8VkB8HE8iysVLTlj
+HWnLx/SSQjYROppUokD5iB4RIag5vQ4+X55Rj43zXH8p3L8pLbe0r0XNeAOODJL6
+SozM3C+N2xsvgkElZ9gg7pRc6K8xRKM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dike.slu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dike.slu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dike.slu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SLU GET service</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SLU GET service</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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:jakob.lagerstedt@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:jakob.lagerstedt@slu.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>Jakob</md:GivenName>
+    <md:EmailAddress>mailto:jakob.lagerstedt@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:gis-support@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
index fb4831c2..a25bacf9 100644
--- a/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
@@ -72,4 +72,8 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:SurName>Schema</md:SurName>
     <md:EmailAddress>mailto:schema@kau.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>Incident Response Team, IT department</md:GivenName>
+    <md:EmailAddress>mailto:irt@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/systest.minastipendier.se-shibboleth.xml b/metadata/swamid-2.0/systest.minastipendier.se-shibboleth.xml
new file mode 100644
index 00000000..100d599b
--- /dev/null
+++ b/metadata/swamid-2.0/systest.minastipendier.se-shibboleth.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://systest.minastipendier.se/shibboleth">
+  <md:Extensions>
+    <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"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-08-28T14:30:35Z">
+      <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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://systest.minastipendier.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://systest.minastipendier.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">MinaStipendier systest</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Scholarships for students and postgraduates</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://www.uhr.se/digitalisering-for-universitet-och-hogskolor/digitala-tjanster-for-larosaten/stipendierauk/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://systest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">MinaStipendier systest</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Stipendier för studenter och doktorander</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://www.uhr.se/systemtjanster-for-larosaten/stodsystem-for-larosaten/stipendierauk/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://systest.stipendierauk.uhr.se/Home/PrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>acc.valda.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=acc.valda.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEAjCCAmqgAwIBAgIUU62Om6XD5Qy+qFOCB/MRGF5oRfAwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQYWNjLnZhbGRhLnVoci5zZTAeFw0yMTEyMTcxMjAwMDJa
+Fw0zMTEyMTUxMjAwMDJaMBsxGTAXBgNVBAMTEGFjYy52YWxkYS51aHIuc2UwggGi
+MA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDnQNp608o+y13KzmzfwL4LTbAl
++knmrHURY2sIGLduDuXbWUmsdpw7FqGuFAM9Z5BIOmWxcH8G2Q+3HDutiBXBJeKb
+qsg3XViArZnbvthee4b1ytLhhOZJ2PuGACnFWcrftxGLX50d7A4ZS1i7n27SrhfZ
+vsuTJ7Iq8SZXTPm17NQrR/PjBna9z0Vq9k2jszGzidIniZmgF4GhCQ08YhIEg7YV
+ES3uzqX7YPosmBN+q1GPcYw2RInt1d/+lHbrkPzoBsLXE2uJGcWKDiG+0J/o9xQI
+kJoWsi8/+vCwPW6qusf/bWoX4bExJgzdBi61gtYEXEOUuuTdBQpexC4bBWUG9BtD
+ZJVgK2apfgbGStHZ16J0Iq34rbfhYBg6teP5rCu5p2hy2IbEiWn3QUT1N3oIhLD7
++5P6p1tcXswWno5coP1v/WQijILzTZiYccDcrKYYoZlmu9spuvtKFRfEva87YVvj
+lbdw5c+VFexLyp6/p3wZ/f0yWLDArnMl27ysvnMCAwEAAaM+MDwwGwYDVR0RBBQw
+EoIQYWNjLnZhbGRhLnVoci5zZTAdBgNVHQ4EFgQUDyKUn9QSgcKC8flXV5M66/mB
+LWowDQYJKoZIhvcNAQELBQADggGBABKkVBo9TceEfmAQtRU4wWvwV8sBG3OXpesd
+KvFfV+7rKs4YcebUBzr5F/XxGGbAITKhmqleI2XjML8hr23cfxGFhGdckxf2PXuP
+GO3+lHWM4fKzvpbm1bCBUbx+YaTXnO1/MD3uVAUXnhEKtAnsxpV3EaUCpnh9O8lH
+tH+l3JxvU+GhmCoWlO9DlVZlnWgj3+E0ztHicWGMwp/W1XlLPeE9trN8xl0PzhXL
++lqoRHLQpD5iLA2N9B5chtPM/UvbLQ7URS0voANfuGatSlKeiALqRadVuBqsS4/Q
+0w7toajxrTHbwic/udn9VPsOo4PQU9/CM7r+eJcGxKFfd+c8UFnh38xN3LRRBONZ
+nEZe2u2BUKKyW3Bny3AK0enVlnmqkw02xt8x8B4AHJIFaSk3bAeG7XgrBl1jQHfK
+gFk0V3eoVBSPe/jvSS8nfsbKV6k2dXkUZa8Z2u2h457H1ikxlLqEUKFyK1tDDFhT
+rLT94sn8cj6s7zqKnIBXqdrL/fL8Aw==</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://systest.minastipendier.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://systest.minastipendier.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://systest.minastipendier.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://systest.minastipendier.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://systest.minastipendier.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://systest.minastipendier.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://systest.minastipendier.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://systest.minastipendier.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://systest.minastipendier.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://systest.minastipendier.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://systest.minastipendier.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://systest.minastipendier.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">UHR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och Högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:annika.astrom@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:annika.astrom@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:annika.astrom@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/weblogon.ltu.se-shibboleth.xml b/metadata/swamid-2.0/weblogon.ltu.se-shibboleth.xml
index bfb35b5f..e4057237 100644
--- a/metadata/swamid-2.0/weblogon.ltu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/weblogon.ltu.se-shibboleth.xml
@@ -27,7 +27,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weblogon.ltu.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblogon.ltu.se/Shibboleth.sso/Login" index="1"/>
@@ -42,6 +42,72 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://www.ltu.se/en/student-web/it-support-for-students/your-user-account</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFCDCCAvCgAwIBAgIUcC8bD4kUYpkBLZiCVSb5wpm2TsUwDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSd2MtYXV0aC5pdHMubHR1LnNlMB4XDTI0MDkwOTA4NTc0
+M1oXDTM0MDkwNzA4NTc0M1owHTEbMBkGA1UEAxMSd2MtYXV0aC5pdHMubHR1LnNl
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2r5fkjTXs9xjzizPe/A4
+oxMqZ+2nkQ3lL8mzGgJlquDK1n5bfELaKfkA4mKnIU04h79LmLeWvugCBLoOB0jr
+Y73rRLJOBNQS04GZbzRom8AuW9eVDZ/QbnlgLcQN8sPCu3Sa4Zjtkuu5IptOhdJJ
+YskmR9XI5kZEWB62iH6XFRJ0phU7/xpvQpqLcBJboOCqRBYl0Dg/7x1CiPBz0FFQ
+vlFjnJei//YQCUNImk8MQO1E3adSjKa88RFMO8yNEiyac8yz7o9He8R7B+mWLYv/
+I7iuPF598rhCZQfksVZOcRnaKYsvsJ/PY6avOwVExo5mHQOygNwpmFmGIMLIfDxh
+FRT10Dp+MC1mdiJvEWoOMOBWkgpq/apejq4nj68m4KnaX6WFJzYalIQHU7LKLEje
+iLquzOcQ4tNj79aasDrGtsoCk7XDPSEVaOELtDSZYZp9TbF8ZRDNdVwsN/wc9oHj
+RHXnW6mr3Km+eJHba/R76Xd5vDYA4eF4r3xrNrtCT6jj+VKjBsiTtVstkOT0Bg/Q
+6ZmctM6u4t4/u0blz3aGgZC3nguGv8hOQl2UHepjlWLtkfdU1er4rizwUSIfzC8P
+K+fg1GnscGWal4nx9Z9XsFXaHOScSJ0KFMyllMBGSlnt/ohwiu5jHgClL+4XOkig
+ds/9EYgazQ/99J+T+mgjAIkCAwEAAaNAMD4wHQYDVR0RBBYwFIISd2MtYXV0aC5p
+dHMubHR1LnNlMB0GA1UdDgQWBBSz26uftupruVIuu1TkLNIKp8ThYDANBgkqhkiG
+9w0BAQsFAAOCAgEAivE3YiAQOrsFqabozvwAGqEBATIq+UjYVUfKJ/+KcnPmOvp4
+gANFiFJfaj4pXcvYhfPSpCdV5myx8ov9HzpNLIaPVIBLYdUT1JhdQfFMTs2tx/hE
+cymWXij4S8CjPbt7XEG8LuVB3IoMR/1H9KwknZ5G1Y8KbEmI8GDf4uQQD4EZldVz
+USvx3nVmbA20sISvODArv9++rQqS/4ld+2xb8aWu9CpO4LQ3WYGa+1RKQ6+GvUzm
+P43IlkMWE6Cdu7BDCyxd5UosVV6unaOydZmfZpGO2j8GClsFRmsh06NjzfzWB4AD
+mjRiVgql0qvmkgF3sYRhzzEfaonphGPAqCvfyWo4BhX2Olx1jytdgWRxYohlSB9M
+J0YELs5hm/V1Wl+wWGRjWSb0QVzc4EJRZ07iPhcZLhVWoC9hACu8W/j5+FUyC7zz
+9UFDpGtPKXBU6tuLabkmCrYX+PXHaB1ZTlC5cmszIxmL6LckamUZj/C19DahhkbV
+7G/34lGV5FHcJGhywddxdyHkBYD13JnmoAgflu9QXd1Yv5ZbBlpXires3/wa9lVB
+0HJbumcrR+SdBYcEYfUaihpaPxK0A1ARsbpWheW6OvAYsfHrzRyyKytz7hOnPUz/
+Wil1rvDi8T2KuG3RQqpfKCeKpDBq6dKQTHtFlrX99gpgES9vqPFbRajp1uI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFCDCCAvCgAwIBAgIUBV1AHKQpUWsmRsDEKRfMpIYoIUswDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSd2MtYXV0aC5pdHMubHR1LnNlMB4XDTI0MDkwOTA4NTc1
+N1oXDTM0MDkwNzA4NTc1N1owHTEbMBkGA1UEAxMSd2MtYXV0aC5pdHMubHR1LnNl
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9FlCSlrkeueWxMXKKlTv
+mfzIt6jkA17Hv6cP879A9rHr1KBjSfkKShH3KU8ZrNusUy0LKoT+pl+05giAG3qW
+R5Pt+yJAn/eLxh+VqOPJmIbloS/rC0SDvOH/hQz/DEpJae8Ycc4ej+JhTURYGxbF
+eZKVlPy7voYjLTdwO7QNGh7Wo/6gIDU+nLfBcYwL7/hdSuNcQbKdr+OKcMwc/0vm
+9laY4Dmmn2CSP7xhhGKwZyeJPn56NHd9INYPZmzl2Qr/XhaiPyrdNYpgFA2sEKvW
+gdyA603vsnQFiKRAdzKWJ6E36OHwKsqHRDDsm6wGN72Ww+AZIsY9aa7gpW4tEYk2
+hQSr9vT0OtpSc0nQwoXY9gry2u3bpT5KSs/CM7NmEJ95YuTtVqG8TydL4ISOO48i
+w3JBnplEO/EVFOO1/efJ1hEe/9rxmknmM1k6xyyMeN3pJUV5tcCD3PrNp51KZV+6
+WlhelBhpIYXDiaYA92PsuO9lUlLK1IJQwKZMpV7xV29ot12QuigdyG5jq+JIIsrU
+f0q77V+D+xb7ULSbhWNCOONnMcKULzKpDTby0AJPatRh9FgDmmIqqJZG5PcGFrBS
+5Aq+P6a/oZRDFiq7srIuSQgNRBfw/m14vjPjq1vUg1He6XofZuJliZ/vbOLGrogt
+uwF238u8CVUmDZIUQqgm1c8CAwEAAaNAMD4wHQYDVR0RBBYwFIISd2MtYXV0aC5p
+dHMubHR1LnNlMB0GA1UdDgQWBBRlgKKwBa7R4exhe5kH8jZiscJp7zANBgkqhkiG
+9w0BAQsFAAOCAgEAXF+F14njh8FAcagxlTOlCroRq0S1O1r7lDYqBcuuPCIotDSa
+Z5iA3iEbP5M6Y8N93x/ugHUay91wFlVY9O5Yl7fkhYEUXmzXc1rQZW9cQKKREpJM
+/sKLtNHX9pNfIhk39Gnljs9FGzP2jMQnBnhjNtPhO/C9njAOlwaUpSeuC75jQftA
+PWz9oiItrQTYIVzNDdlpL1PnCBZDy43m4xcTNBH2iRuJV4bKOi9F5qZSzFEoV7ck
+hrMzAxo0lapgNzIlUHxYKj4mJBVxkq0lpgfGSCwpYf81zHeS0j7yh83d5fibPUtf
+fqFoDyVDlHyq+UIjJkJFBH/VsQ51ee6ohwZsDpKu5R9SRhP4pRh4QTnsDU+VPvxE
+pzRtezEsg7DfFiIp9X3rTJXYCdslbAHh0EqzJvVGCBGvg0ftasnWRCESA/J3tEAT
+kzxLe4Kz+7jkxr09RE0mDDc+1BRWzvrfcuRpP1WjIuEaF17COGplXPfEKHjxpyqn
+Enav1xDmYiQ2a+QkcvsT9JkLnkYwhjpBFucrHLAKqbHLC9VXsqenwD9Mi6KTb77S
+25GOOWmy/iyt/nD8O2zaROFMlvS1RBgYmVlWrlBrrkBqU0lAsPl9SIb2Lo2v+W15
+lA7dJ20saAdhKLsRBwSLT7y5WmSUybfZYMK/vbhrcCIoVg5x5qq9pXpv+Xc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>wc-auth.its.ltu.se</ds:KeyName>
@@ -84,8 +150,6 @@ JQ==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Aktivering och lösenordsåterställning av studentkonton</md:ServiceName>
       <md:ServiceName xml:lang="en">Activation and password reset of student accounts</md:ServiceName>
diff --git a/metadata/swamid-2.0/zeus.slu.se-shibboleth.xml b/metadata/swamid-2.0/zeus.slu.se-shibboleth.xml
index 217148fe..8de8ca3a 100644
--- a/metadata/swamid-2.0/zeus.slu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/zeus.slu.se-shibboleth.xml
@@ -28,7 +28,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://zeus.slu.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://zeus.slu.se/Shibboleth.sso/Login" index="1"/>
@@ -63,8 +63,7 @@ Of9XRr28oDnUAre6TfwalT5Oo7i+yudn/vsJQ+OOQg7MbxAE7nxPrZeRAEdujNsB
 VXDUM1EsCBYOBKAoxECfjZteZNjjxeLomqZ3RHv08SHb7UqeYzvtUoW6oSf65xBJ
 AQx+pdK1HvqZai0OhkBDWaxj1s5cp21p1La9VsFjBv93EvoMdvln5v3ahoHfvbba
 tnnvjbDjiMz+ReqQkJFa3IBBV0RhCjwxvcdep1TwJ7e2xAwRSFzziMrDReQP676C
-pip6tdI9bf7wXvV/3/jBjGaeThWUoaJsO+TdiA==
-</ds:X509Certificate>
+pip6tdI9bf7wXvV/3/jBjGaeThWUoaJsO+TdiA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -85,8 +84,6 @@ pip6tdI9bf7wXvV/3/jBjGaeThWUoaJsO+TdiA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeus.slu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeus.slu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeus.slu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeus.slu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeus.slu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">SLU GET service</md:ServiceName>
       <md:ServiceName xml:lang="sv">SLU GET service</md:ServiceName>
diff --git a/metadata/swamid-2.0/his.hr.evry.se-shibboleth.xml b/metadata/swamid-edugain/his.hr.evry.se-shibboleth.xml
index 3e9a9f52..05052410 100644
--- a/metadata/swamid-2.0/his.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-edugain/his.hr.evry.se-shibboleth.xml
@@ -16,7 +16,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Primula</mdui:DisplayName>
@@ -73,8 +73,6 @@ uR3r+JYxFIMuNHxlf3BlrH4l+w6CTvawf3ED3XnJZpEv</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://his.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://his.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://his.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://his.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://his.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
       <md:ServiceName xml:lang="sv">Primula Web</md:ServiceName>
diff --git a/metadata/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
index 05a855c5..9cafdb7b 100644
--- a/metadata/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -26,8 +26,8 @@
       <mdui:UIInfo>
         <mdui:Description xml:lang="en">University of Arts, Crafts and Design</mdui:Description>
         <mdui:Description xml:lang="sv">University of Arts, Crafts and Design</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Konstfack - University account</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Konstfack - University account</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
         <mdui:Logo xml:lang="en" height="36" width="173">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
diff --git a/metadata/swamid-edugain/idp.ths.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.ths.se-idp-shibboleth.xml
index 58e6d61e..a0f0aacd 100644
--- a/metadata/swamid-edugain/idp.ths.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.ths.se-idp-shibboleth.xml
@@ -9,6 +9,7 @@
         <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
@@ -16,7 +17,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp.ths.se/idp/error/ERRORURL_CODE.html">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://idp.ths.se/idp/error/ERRORURL_CODE.html">
     <md:Extensions>
       <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
       <shibmd:Scope regexp="false">ehs.se</shibmd:Scope>
@@ -36,29 +37,6 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
-MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
-IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
-QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
-VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
-zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
-iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
-HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
-S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
-GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
-wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
-r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
-GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
 CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
 MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
@@ -102,90 +80,26 @@ xAdB19mh1plahNrAaEfu6Ldetyz9iulY</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">ehs.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
-MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
-IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
-QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
-VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
-zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
-iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
-HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
-S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
-GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
-wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
-r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
-GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt</ds:X509Certificate>
+          <ds:X509Certificate>MIIE8DCCAtigAwIBAgIUdAM+3K666kma6XdaaB9NpGGz4M0wDQYJKoZIhvcNAQEL BQAwFTETMBEGA1UEAwwKaWRwLnRocy5zZTAeFw0yNDA5MDIxMzA1MzdaFw0zNDA5 MDIxMzA1MzdaMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwggIiMA0GCSqGSIb3DQEB AQUAA4ICDwAwggIKAoICAQC5aXcO+eIqSqEl/zJ6v8j8orRpyXgxUDjL+p2VbcTl ne7e3/1xoem8AGCLLKwYPvOM7yxlxNDe1piBY2Q7tjv/cbywUWtZDm3uYjz8qSAG Fool5hzphCNtC8tt6LO06g25hGJudxaMiPdOkVcv3Tj7+M7jaQFu5Zi1SrbRqpBq mwIonuvCOEtOTaxI5c95avJP+/LASn5jiKa3LmWtClfMhed/sxt1sKv6hMaeFOme lOmaMfAiTVUxAY5ZayR53f4rsqrAEHlKoTQ+XQUMYv4RhRDQ6t8g3dAAgwUohYuE gQK56H8PiLH9g+/6TQTcGUAs8rpAdgmJp7LqrgiBzzUDfb6pLnrkY7Uog3O4MfPL zqQzdPhSWeBbb5wy4ZNLCm/NEHgVG6dzWXTS9z2f3ZcE+qngVIE/OhscMWyVWeVh bndYGnOb20Wai0Te5JtiRIiwzPtAUxq/p0HE7qf0OniIM8ZG8dFu4wHAFOCMLRN3 1za9vQNeGkHqDkShn7oO6JRscZLZ+vYjerEPiN1rGsebMsgGk18jd1v86llR1b+B sJc/Pbhnkc9L1mU0mJSymQlEBquUk/p6faOfGmbp8NDsrWJp65d/bvUfkd7lwB4U cozPeQnnOmWisFIcFYwLz5q3MAQjL2C7E3IJeiARnG2q239OVfytR2ROHjOQnU2D qwIDAQABozgwNjAdBgNVHQ4EFgQUMHRUue7dNTs9iEqLLriRRbzK+OowFQYDVR0R BA4wDIIKaWRwLnRocy5zZTANBgkqhkiG9w0BAQsFAAOCAgEAfUR9i8r+hY3HWMw7 0j5lp3Qc3EKQdKWnacRp944/4aNtoByNtaZiFN/IGBQzonwdfDvpa/7zK2XJao5S WQXCrZ2Zzzrkq5YdGIBI7Yp75eWtqQADF2DZYJnyCYWSwoKcGrBtoy1SFjWdQ1rh exCULsEPQzUc9IP1CxOlCFG9wU6EUnoTiwsKEG2xShyIXk6HZcm7ddnd3/kwgeSz hxhrJ8fP1DRUiQeYaT3j/Hj3A54/ZePnaSJ3lnS/YWdZoGbZKTI+557UCXeWbV0y WhMQOhtCO6fxwwDCCnWYUbnPRaDFoTB45Ue//8XVCsUcVuxqGI8P/qunJRsRYcT2 BrRvdiADToll74YcY/zy/sbjA+KE+WXSSls/BKegwouVny8efkKSS4amJ6lhBiKA 6yNj0TRf1ne7KO+gwvbSdmKQTR5ltoV7QAYoodiehH7DrtcbCvezk/eAGyM1itqR V63QdMeccWOR94ZU3NSHrAfspI8Zagrnpb3+19emvVhNHiTOp17/jP/leaPIWne2 KQyeFxranuGngomojWJs2nm6r+JanHVE5eKD//eluV9NJ4IiqJT2zWmf0Zhfe9EX QD7Pff22fAvbxCaQjZZmGmafKHNVM25sK7mtH5rlyAwJxFH9zjZPkUL6Pw+VZrHQ NKou0a/AKC7DfP/NqFSyVzMwz7s=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
-MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
-GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
-Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
-HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
-DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
-aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
-HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
-f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
-Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
-WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
-0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
-58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
-MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
-Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
-ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
-/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
-goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
-mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
-HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
-yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
-UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
-2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
-SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
-xAdB19mh1plahNrAaEfu6Ldetyz9iulY</ds:X509Certificate>
+          <ds:X509Certificate>MIIE8DCCAtigAwIBAgIUSTDINlS7++S4b+RRbIOLwNC+ek4wDQYJKoZIhvcNAQEL BQAwFTETMBEGA1UEAwwKaWRwLnRocy5zZTAeFw0yNDA5MDIxMzA2MDdaFw0zNDA5 MDIxMzA2MDdaMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwggIiMA0GCSqGSIb3DQEB AQUAA4ICDwAwggIKAoICAQDUpfnF0mmB/FHgN5nIsmZ/ISCfaTqmWapFCyIVNar/ HxWYXSHGq9VKfcmRXW1lsDmNG9SCHohqk8hQU5xL87LGVwCex+Z0kvZ1GtEYlWyt P9i2Rcpyd14EavJyD+imo/1Od9av7tkZwDtNWKzzObq2BSFJFWeH//P3zAnPoJut pdXJWFSq6phbxUtyAMvJhr21Qt7RHHrU2sCtr3i8tIH7Wb0dHbnrdOS33zfZfAqW /rBrq01P5Sa2L+P6XlYyZFR8YWGEho/2gDzayHDapCe1Oy2gJASssKdBjrHF8gCC XlYj3HXvQzMCyYmpLBPAV/qwlpbjtzafTzEwjCaGm/h/7ejtw0jS2zkqjzsc7pUx J6puKC+M1QhL9T34jkuYpXJuz3quddeCi/dQxSwi72IiJE/KQNHzDa4ZUkj3ExA8 GN6JKs6/uNUtefe2IIXEuO4LNUvfgGlWuYFc3/LjcP+Hy/oTD7BXP5PS+lUatIW8 FwgGu+xZGXpeZNAikRyxe01C64UBcHVI26sZ3wWJR+Drr8+sEUSu96fV2QRWlPHS hSteMHZLgrnL12zdYqTpC/e2DQ7Nde4RV982MIEBgM4/z+UkO9ncwUoIgvLh2Hbf QNt2To9ARubAKcxhKqE2RaiUMZfT2LpzIoIOfFYswoTI8SEFmu6sAuhVwU4BaasJ FQIDAQABozgwNjAdBgNVHQ4EFgQUIqKuGCwawSJmAvTI4uLR1fU99s4wFQYDVR0R BA4wDIIKaWRwLnRocy5zZTANBgkqhkiG9w0BAQsFAAOCAgEAuegfduX4oJCUqZfg UGo+CNj0h71g/M+DtyKVGnlJIFDN7+v69xs4p2QMwBs1UmW264jiLr9cpwgODKtT 0qfK7TwvzrVXnfnKdY8ELBbGp+g51OhNm4YT8ZqrU7cRTQ5GoLFOq5+mQJInRBiT Py6RD1lmgvie0WSXHFyE1kxDk4N9NpDOuNbUskoaHteEM0u00HxDzmPqeP/L32Ym DBZRFGdD5EOmwcSsrscWA3c+fGGTLxLEJxGanLuqJX3b+teHmS6BOEY1I/uPGgm5 hwcea4VsmYuITbosEb2Oh00FBbRcYGAPk3EPu7W9KBrLIde1/xVhJbCMIuTX17Jv 5tyAX9npOGicS5zSQ+dyksuMjNcKd10EIG4P60bLFyNl0ILEnASkUIvDE/kRsteY 51kWhRapYIxkG7qYUXrlppVi0+lqf9UDcutzePzaGhtEtnUXJVGD9Y8a2mSXMKFD mf7+LR/BaZst3SXSSk6cunUnmdXih2YxCQP82uhX9Y2mASv5BzvhP082ZYXxIpmx 9qxpwZTg9lrep9Mb6fquMWy0P5VaniKA7Uh6OLMXlD6av+OFrctlvHpufzqRVb5P lIpiYfhk7j2CR+Ra8N2M5gnvV4g8Ou0+Kx+RpEMkfDEeu2hOdTnT0fo4lCVmBaZA YtyU9+zNVxoSVuzjcnqyB0z+7+E=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">University College Stockholm</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Enskilda Högskolan Stockholm</md:OrganizationName>
diff --git a/metadata/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
index 5bfbf4b8..cfb2108d 100644
--- a/metadata/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
@@ -10,11 +10,11 @@
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
         <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -96,7 +96,7 @@ DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
     </md:Extensions>
@@ -147,6 +147,7 @@ DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
diff --git a/metadata/swamid-edugain/samitdevtest.ita.chalmers.se-shibboleth.xml b/metadata/swamid-edugain/samitdevtest.ita.chalmers.se-shibboleth.xml
new file mode 100644
index 00000000..fe1097a6
--- /dev/null
+++ b/metadata/swamid-edugain/samitdevtest.ita.chalmers.se-shibboleth.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samitdevtest.ita.chalmers.se/shibboleth">
+  <md:Extensions>
+    <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>
+      <samla:Attribute 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>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-09-09T12:07:45Z">
+      <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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">SAMEurope database</mdui:Description>
+        <mdui:Description xml:lang="sv">SAMEurope database</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SAMEurope database</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SAMEurope database</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://samitdevtest.ita.chalmers.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://samitdevtest.ita.chalmers.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://samitdevtest.ita.chalmers.se/admin/policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://samitdevtest.ita.chalmers.se/admin/policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>https://samitdevtest.ita.chalmers.se/shibboleth</ds:KeyName>
+        <ds:KeyName>samitdevtest.ita.chalmers.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=samitdevtest.ita.chalmers.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFVzCCAz+gAwIBAgIUCAnHTTk9rCYdaASdxWvAyuu8N1kwDQYJKoZIhvcNAQEL
+BQAwJzElMCMGA1UEAxMcc2FtaXRkZXZ0ZXN0Lml0YS5jaGFsbWVycy5zZTAeFw0y
+NDA0MDUxMzU3NTZaFw0zNDA0MDMxMzU3NTZaMCcxJTAjBgNVBAMTHHNhbWl0ZGV2
+dGVzdC5pdGEuY2hhbG1lcnMuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQDcsJidY9MDGSdXexKtadKUv/ajFJyXoUsSCpdSlJsPuQ5/Vc92uyIQRnAZ
+4CXISlMmknmhSYtBYYw3WYl+/10qA/KW3UYqEHnEy8sVisxPgxws0IjwVF6kX6LA
+Ehto7n5t/YdEjhCyOru6H1ik6oca1BSCZAtxp6mKRxnxBYLOeQdfGfEKvXTvFWix
+fevaNyEFSemMMPRlx5P1NO9CVzOFLHE9+7lNKV6eR3Vk0aMazLdepWDWP2b0HUI3
+U0TSuS0hziVfmSnjqT62n4QwjvEkKbDfb/PMFBHMK2/Kvo2jr97d8buWFh55f6Sw
+nptHZiFahixPkDLBNxTR53TZExWE5E9OiDRZ6H4RqoT/6hCgcsy/z9iGIGhM+AVT
+7INVE7P0F7jrD9yJkbvInjJUS6OxTMkvpzhbY+FCRCTym0Q9AEm2bBDI/3LYoFpC
+N6OJWKUpD6ygv0xtrUIORWSEu2iDtfNPpluzjsQukZKxhoKtLOUiWYq6jPVlT5GT
+dfw6JfafpGV5ozxrgSBiJI/qMFGTLBCCtVTFpzxQAOlClcgg31NxK8M9SypJ562h
+Sl2EWiM9p8tzAqABql70cfYqAXHa0jmf7s9VaTX6TeKBxV5Ie3nS3DDTxqZhsBxA
+3K0Tevy83mBReIG204aTO+5tIyATLQQJsMx939bHNmyBk0cTZQIDAQABo3sweTBY
+BgNVHREEUTBPghxzYW1pdGRldnRlc3QuaXRhLmNoYWxtZXJzLnNlhi9odHRwczov
+L3NhbWl0ZGV2dGVzdC5pdGEuY2hhbG1lcnMuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUt3CHR3uKLtMsoXR/uj1hT3lW9MwwDQYJKoZIhvcNAQELBQADggIBAEpi18mF
+IGQKn9LD3Sb6orlb+0nc7kVUdsojnPEa/a34fVFurxwWT8y2HsrLLO/ypx0hFf8n
+BXxTV6Dxi4RNH9L+uBherCVBOZtdxTbFC2mCkh18VHLTbK/TnhQeyUwrS8+pqiWW
+agPjZDtw80xSe9huYfBlXnkXKkwAo1TQkwwHyQ9BbOvmxpa+XeoczBB844a3u3Y5
+UXbWWvD3eUhld6Djl2FawYc8amRqDVB24T8V/Z90oZXiZscccLY1/K8tceZQWseI
+JvRf5RdQgMaIo8DQA2bax02Q+mdzHf2rIYqVuyEOUd56UlcS9CPGFuP2tPho/WRC
+XnkYgSwxLJClvMioKsIs4GRqFuhUDOEcRrd9SesMcP9EED6b9hwwLY30fsdT6EFG
+sgNGX/Wh79zznVMWqUey5asDpUbzcqgPjHRIAcZWfND+myz8Jen3EKsjs5TGnccj
+xHCShb1bbc6N00OswBwQyNI9SRmH1/ppvrkOzf2IFVUaDyWSpX2FE25nnBHE8yvw
+xoz/U5qQ3u0PhY7ryJ2n++ksw24wcyh8T1NMNuxNYghmdnOkLcfnYLwZlE/1hJlk
+bIvf0Dah8ovRxl+WFbMTuA9OLY7kSaNHZ4lRh6e4bjRZLAr9F6KqE4E+B5D8TdeS
+nAIYASAA55ziJ/9VFtQxnj8x2F91Srty81iY</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>https://samitdevtest.ita.chalmers.se/shibboleth</ds:KeyName>
+        <ds:KeyName>samitdevtest.ita.chalmers.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=samitdevtest.ita.chalmers.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFVzCCAz+gAwIBAgIUCAnHTTk9rCYdaASdxWvAyuu8N1kwDQYJKoZIhvcNAQEL
+BQAwJzElMCMGA1UEAxMcc2FtaXRkZXZ0ZXN0Lml0YS5jaGFsbWVycy5zZTAeFw0y
+NDA0MDUxMzU3NTZaFw0zNDA0MDMxMzU3NTZaMCcxJTAjBgNVBAMTHHNhbWl0ZGV2
+dGVzdC5pdGEuY2hhbG1lcnMuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQDcsJidY9MDGSdXexKtadKUv/ajFJyXoUsSCpdSlJsPuQ5/Vc92uyIQRnAZ
+4CXISlMmknmhSYtBYYw3WYl+/10qA/KW3UYqEHnEy8sVisxPgxws0IjwVF6kX6LA
+Ehto7n5t/YdEjhCyOru6H1ik6oca1BSCZAtxp6mKRxnxBYLOeQdfGfEKvXTvFWix
+fevaNyEFSemMMPRlx5P1NO9CVzOFLHE9+7lNKV6eR3Vk0aMazLdepWDWP2b0HUI3
+U0TSuS0hziVfmSnjqT62n4QwjvEkKbDfb/PMFBHMK2/Kvo2jr97d8buWFh55f6Sw
+nptHZiFahixPkDLBNxTR53TZExWE5E9OiDRZ6H4RqoT/6hCgcsy/z9iGIGhM+AVT
+7INVE7P0F7jrD9yJkbvInjJUS6OxTMkvpzhbY+FCRCTym0Q9AEm2bBDI/3LYoFpC
+N6OJWKUpD6ygv0xtrUIORWSEu2iDtfNPpluzjsQukZKxhoKtLOUiWYq6jPVlT5GT
+dfw6JfafpGV5ozxrgSBiJI/qMFGTLBCCtVTFpzxQAOlClcgg31NxK8M9SypJ562h
+Sl2EWiM9p8tzAqABql70cfYqAXHa0jmf7s9VaTX6TeKBxV5Ie3nS3DDTxqZhsBxA
+3K0Tevy83mBReIG204aTO+5tIyATLQQJsMx939bHNmyBk0cTZQIDAQABo3sweTBY
+BgNVHREEUTBPghxzYW1pdGRldnRlc3QuaXRhLmNoYWxtZXJzLnNlhi9odHRwczov
+L3NhbWl0ZGV2dGVzdC5pdGEuY2hhbG1lcnMuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUt3CHR3uKLtMsoXR/uj1hT3lW9MwwDQYJKoZIhvcNAQELBQADggIBAEpi18mF
+IGQKn9LD3Sb6orlb+0nc7kVUdsojnPEa/a34fVFurxwWT8y2HsrLLO/ypx0hFf8n
+BXxTV6Dxi4RNH9L+uBherCVBOZtdxTbFC2mCkh18VHLTbK/TnhQeyUwrS8+pqiWW
+agPjZDtw80xSe9huYfBlXnkXKkwAo1TQkwwHyQ9BbOvmxpa+XeoczBB844a3u3Y5
+UXbWWvD3eUhld6Djl2FawYc8amRqDVB24T8V/Z90oZXiZscccLY1/K8tceZQWseI
+JvRf5RdQgMaIo8DQA2bax02Q+mdzHf2rIYqVuyEOUd56UlcS9CPGFuP2tPho/WRC
+XnkYgSwxLJClvMioKsIs4GRqFuhUDOEcRrd9SesMcP9EED6b9hwwLY30fsdT6EFG
+sgNGX/Wh79zznVMWqUey5asDpUbzcqgPjHRIAcZWfND+myz8Jen3EKsjs5TGnccj
+xHCShb1bbc6N00OswBwQyNI9SRmH1/ppvrkOzf2IFVUaDyWSpX2FE25nnBHE8yvw
+xoz/U5qQ3u0PhY7ryJ2n++ksw24wcyh8T1NMNuxNYghmdnOkLcfnYLwZlE/1hJlk
+bIvf0Dah8ovRxl+WFbMTuA9OLY7kSaNHZ4lRh6e4bjRZLAr9F6KqE4E+B5D8TdeS
+nAIYASAA55ziJ/9VFtQxnj8x2F91Srty81iY</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://samitdevtest.ita.chalmers.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samitdevtest.ita.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:it-support@chalmers.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>Chalmers Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Per</md:GivenName>
+    <md:SurName>Thorén</md:SurName>
+    <md:EmailAddress>mailto:thoren@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Per</md:GivenName>
+    <md:SurName>Thorén</md:SurName>
+    <md:EmailAddress>mailto:thoren@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>