Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-11-23-v04

6 files changed, 7 insertions, 677 deletions

diff --git a/metadata/swamid-2.0/account-utv.hh.se-Shibboleth.xml b/metadata/swamid-2.0/account-utv.hh.se-Shibboleth.xml
deleted file mode 100644
index c676b1b9..00000000
--- a/metadata/swamid-2.0/account-utv.hh.se-Shibboleth.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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://account-utv.hh.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="2017-01-20T14:10:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account-utv.hh.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">This service is only used for testing</mdui:Description>
-        <mdui:Description xml:lang="sv">Denna tänst används endast för test och utveckling</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Högskolan i Halmstad developer site for user account activation and password reset</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad utvecklingsmiljö för kontoaktivering och lösenordsåterställning</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://account-utv.hh.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://account-utv.hh.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>account-utv.hh.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUZxEzKJ3kDq/GvtQh1pmSBA5GAo0wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwHhcNMjIxMDI3MTMzMjE3
-WhcNMzIxMDI0MTMzMjE3WjAcMRowGAYDVQQDExFhY2NvdW50LXV0di5oaC5zZTCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANOV6xBmYlBQ95kxBjYL4EQk
-4IYGr6948hKp9Oq9wygefSkUs/S2KAMVTlr1/cK9IWDN5zbsKSb9JwGg6ySaqs9J
-Ff0B1GVvrQDaNK5haWB3Ihz2jBF7rD+TW5jOK/lYwfbkTJXLb+NWrro9HEIByG7v
-5tz5hkGc7k0TPXp/1vG19lxTbexS45NLtD4NUTS2j3++HE9zM1YHHvTLX8TGUnDT
-gCjcWDQoewud037D0I9IkdYtGcgmOU9dNH1jxCmcJNFeg/4poc1UxqVJUZUS92qR
-+BcdPoBrCYHqoXLidEYLYLxZALIMpqX34y/msLv7kDvWZRmMpCupM4PvK3uAV0VR
-f5APMAjbUsH95izClmwbEvTkx1XQXG4YgF6kgdbOOO6UIfvF6Z3XAWyRRnsAd3tt
-3uTyNx1vm/Ex1g5lhbeH+cxxFkrCKMDLwa8ajlvWBM5cNWHKEOh75LfvzZVJAeNp
-4+eaF3AmO2qc8eefj9vFXsROolgmtbNnSQs7vGOYyyjNGtlcQslVgR9oEr/hyZIz
-hvQE+O9x+Qc/bzCLBK2E3GZaIinydVU97KP3PNE2Kvxa3CIhqdA6inBzOb4W6vGG
-uStQakuue9rtSDP9hgssFKFtCBgcS/9pDXB/GbXefZERHnnTtwf82PKEr0hBKWGW
-PCk19HWpy0g6m9BjB06nAgMBAAGjPzA9MBwGA1UdEQQVMBOCEWFjY291bnQtdXR2
-LmhoLnNlMB0GA1UdDgQWBBRBDdOyoQyT/+w7ApUhbFsxQeXHJDANBgkqhkiG9w0B
-AQsFAAOCAgEAHQAAtgoCGqPv2z15F+TB/4u7tvz65eFb06YN8RmckiWb77fHG0JT
-/FCr51Zr3EDVUU3DCe7KLvKRUG0WReC4ANYw4f/L0pJ25841Uwm41tOwB7ek8Qps
-X34rUsPdxmLjbXBHvNio9KobAqz/ENs80boFon73wuKa36rl3wrTGWrLYDG4+VOm
-2FH6bdsME30hDLsemOxBvslOZehGheRQwCFSBwK5rTD7/BEEDZtXWPn1TmFg2CAX
-/+nn+P4wd8t1uneK3AxpBu+11iZS6u40IMTHinco3KHQkYPFRC7C1GCofju2iLkt
-OjWpbWovR8PMifUwbjU2rLYDgCUfU94F70U3IvsSBQNzNbesvzv8Dy9e5vD4kkhg
-jZr4j0blZqP0OAuvLVGpTU0QRqxkd8wcmWijMuVl42TKP1td174M3UJ1bXjpBv9S
-qhfDdOqcdxVldx0U54sWk4reOQTMVFX0viBPvCe4Fl0XgMyHVCEEkId6p3B13BdN
-eXvM3fJjAPLBXN5N+wr2L/o/0gsTZLQNIXVLNXigZyQvTMKveC1TUyInanksWI2e
-ufL+FCkZsl14GWuv5SJB9QA1wuIuLrSEGOEUD0KZgUETvEWaJOmKHdQ9gt64KqsX
-32LlH8M6eDC+/v568zngqcX6YxTxE8kqtakFNVyKtZrh7XZEsQ5T8nw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>account-utv.hh.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=account-utv.hh.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBTCCAu2gAwIBAgIUHLqGIcHWmsjVx4LKZubkaABabe0wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAxMRYWNjb3VudC11dHYuaGguc2UwHhcNMjIxMDI3MTMzMjAx
-WhcNMzIxMDI0MTMzMjAxWjAcMRowGAYDVQQDExFhY2NvdW50LXV0di5oaC5zZTCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANOVF6A2E2t/fwTYtYDQsvx5
-FWnM0uxO34zTLw6g5oWiYX2vAh3BrhzWbgaDvqG947qWFr0YFntQ4Q6Y5g5ffLS+
-dheJ7UTyZoM0Ix5dKasp8+fDO3I73Gc6Y+AvoBRT7UkUuCosXmeIZSdgcalZiwFz
-bCmdi85xcePRJY67NhMuWkKC6kLWQoP5JOnUulfbZKai4VT9LZIzJ0zwuDqtKNlm
-Qj2wFWF8fKf9cw2AMQ5CUlhgcB1y7WcBa0t0/sSR10g6zMNp3AXcSHoBpaGariT4
-d+tH6TEmljKQ8CGpYwAnAmfy8UzbpiOFFhfoyZvxb0VpKXDEUz+PkTRjQkYrjZ+y
-BqeXw50cp+qyw1yPioL1P0C709m+VnDKTzfJ5sZgO7/BOBoNcTKC+LOErCFV0S5K
-VLJUs7XkuEtfA36zB0VNrHXIjJUgSt1zuD0/YdV2kTn6ZtKhfL7JVyEqIg7zNe8v
-X5EMGeomcAN8+Jr3Gqx79j/tvn8sgxKgpvBN7Ujry1R32kUSXDOuxOZq0bMvaa9z
-zwS131ubkyLcLzYMBTi77WsTNFVut2EOyvdjSJ+XDwHDR6SRpnvENFyFytm8sFIk
-TqnSQV9iS2reMpho+P0q9x4mpGfQcBb3nX8YYioFaepPLVba4HedjxrKD82vUeio
-jhUH9HKZvSDme5Hvn5mTAgMBAAGjPzA9MBwGA1UdEQQVMBOCEWFjY291bnQtdXR2
-LmhoLnNlMB0GA1UdDgQWBBQ0J4Z/i1TA9AAQFH1V48Sy8ZXCizANBgkqhkiG9w0B
-AQsFAAOCAgEATUTRs4z1qxbJRBlN25HzUqRXqlK+EqwpqcllBth6l3bAUVeL0gGi
-Mwthi57ROdHDIHRLVkp/gEh58MdsnZF9UC0ZhUlg+FgZvL6H5b283NKZlNPUFqmb
-jbfTu3dloRWb7IbGvjZ2d3k52tXDZuZNm1zxw+STUVVnckyVRBAY++jMLp2cwUQV
-JntMGIzzhepz2xKN4jqib89n7EFLTI1K19xbLqt8l2LegfSk0jGyxq5G9SmyUMQ1
-Q+oYaFAEnSE/LccRQaLKQX0RUAUY7MyWjSz9FYYMmk0Uv1W9bOyiPJsmiT0roVGo
-f+hFxe+pPV0On3iPAy2L7CvC4fdog7X3Ub2ywBTi1NHeIBn/Sr46RY7zCcGU1/GU
-Bgf+pYzJOuk8+8XNmYcaAbgZ7JWW0OwBM/ngfKq2jGDT0iKtMi5+nmkbfg+BxSUz
-qZNs5gPd5P9xYo7d3bLV8T4WZUTs7bIJyNtngm5zdLl7XiPG7aySB4Q6IgqCACxi
-mIjZa7CCKUcoMdMT2l5jbcTvAkj5mXZV5xdHI19Km8RN6MksuqK4xxcI/6U2SSE7
-KYbuezOxT/WF+lZh1ovkpUXpnFdYzWq08YI8In+sdQ0edoOhrJfPaXtBQBuK/sOH
-2ROYpYPv8z27QGDrjR4uZAltn+aiDzdiwv4T43ZkwafCYBh8ilQVNjE=</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://account-utv.hh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Halmstad University, account activation and password reset</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</md:ServiceName>
-      <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="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Halmstad University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan i Halmstad</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hh.se/english.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.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>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/account.hh.se-Shibboleth.xml b/metadata/swamid-2.0/account.hh.se-Shibboleth.xml
deleted file mode 100644
index 0fdd07b1..00000000
--- a/metadata/swamid-2.0/account.hh.se-Shibboleth.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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://account.hh.se/Shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-12-21T11:20:29Z">
-      <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>
-      <samla:Attribute 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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://account.hh.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Halmstad University, account activation and password reset</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">As a new user you can use this service to activate your university computer account or reset your password.</mdui:Description>
-        <mdui:Description xml:lang="sv">Med denna tjänst kan du aktivera ditt datorkonto vid högskolan eller återställa ditt glömda lösenord.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://account.hh.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://account.hh.se</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-en-350x116.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="116" width="350">https://idp.hh.se/idp/images/hh-logo-sv-350x116.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE+TCCAuGgAwIBAgIUUu9RlYuVKrvsC6QovKtTDmL2RiYwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAxMNYWNjb3VudC5oaC5zZTAeFw0yMjEyMTkwOTU5MjhaFw0z
-MjEyMTYwOTU5MjhaMBgxFjAUBgNVBAMTDWFjY291bnQuaGguc2UwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDBernc+U3ySBcL3ifwormKvMI8CJOop3Eq
-+Cmlw7fcrWTkfa8MYCtplhA/dxWg22tAKGCs4d3DomChRITyzF0xS4chFJ0FL6et
-RJrsrp9Yzxy7qhW47qAh0EB8M3b4sKN8CfhMQGi5UuMAcVJyzOMULaNZk34IvSet
-bSYfFzERJpPMuNMTyrrP27zCwMjdP5U4lkOSqmL15ZOk+aldj6Gf6p6vFahQH9px
-j5BVXAq+pzxQY7zvY4flpQs8bxcS86uS44pH51jtQmBoUcCUPSaRdM4voFvp5RqY
-E0T9VoLCU6B7vQ+Vg5uPEV7ywkduWg3n0IpKKckcmEnLDY9u7HX4xr1tgZU5CjCm
-tfNHlBIi2J0BbXXsdrBytrrp2+6oKdTHwYPg83Dl+BhPpHIb09dbGUsn71n6A7EP
-qzanvanLoQFifTdIKuRGQxTXT+S8BtNscEB2krkCGC9y+bw39g1vQfLDUtDG2JCH
-wHC2/MUcOM+hVMyr88nVHtBQEcfH0bWLGhtrD4irp7jS1urLHBYuQLe+SGrj/t65
-4xtdDGICIRT7mLPA6OdaC2T1Sg6SAfHVfgqacAWiGah9awu5TnAswFMJUAvBQ+pG
-ko0zbL4SjrJ6zeofR4uCbLpN7iJJRx4StlY1AC2LMM1VQAjtZrOYAP6EokB5z64f
-NmCCXdw+pwIDAQABozswOTAYBgNVHREEETAPgg1hY2NvdW50LmhoLnNlMB0GA1Ud
-DgQWBBQjaaPeEgsYdAaxBYxTJpMl3cbX3TANBgkqhkiG9w0BAQsFAAOCAgEAub02
-i0jSuPwwvLps1H0WTxa7JkwtzZYtZIIEP+9W/cuT/S6wPVQ20/Vz/KDAFezl1D2F
-Tg3/OssBPNtNELGq9FF3k3bcjy16lKg6H4UX8Ofsk0lyJSQdYKiTXid1hnnx7Wgv
-CaDGknyNr8SakO5TRpzXo8eSLr7Dj7kxjQal3XoNzuNmcpclanAOngHmQTd98aeF
-kq/GGebDsjZrkOKFN8homy5ty5h9zA3KCBBrt6wu0N01gG06tMcZ0yDM3JpSshGO
-YxypG6s+KIKC855AmK8Kdo8JkG2XJ4uMKl0fV3Ig9WfKisio7BqyATsamNE2+IH/
-jdPJEUg7hrlXHaX8DXIIl1XZqmlCDgFPdTYEiRR5vyivJJGnsxMk/m+u7VGsnxOd
-+Dixhqut9LC6iFHZadxnU9dkbMG3wyr3ywIBKkE6bY1ThmizLiHnVt7Z4XitZOH7
-lxytIr3/a7uwQVizQzvR1ykZ3ISVhZzdZhtKprTh6lfZ22m9FsIv7IRBv3Lythr1
-MJj3i1oxxYcWGU+QMal+HujZVM0I1Fqhh9ecoYR7+TmKmjuq6LrE0ZkReh+QxWQi
-KsIs0VvRHVX6+G0CvyIMrZPDzUWH7yVoDz+U/xeDRq6o6Lf/n+Xedhlw/WQXGjQK
-10Tx6TFpPjIpKhWXkvcrtg++Bj/DjuPIpJNGqX4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.hh.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.hh.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Halmstad University, account activation and password reset</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</md:ServiceName>
-      <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="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">HH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Halmstad university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hh.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.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>Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml
deleted file mode 100644
index 4e208c8a..00000000
--- a/metadata/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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://mdu-graylog.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-06-09T11:54: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"/>
-    <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>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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS MDU Graylog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS MDU Graylog</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på MDU.</mdui:Description>
-        <mdui:Description xml:lang="en">Logging system for CnaaS at MDU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.graylog.org</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.graylog.org</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://mdu-graylog.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://mdu-graylog.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIJAJYkSFXOWMEbMA0GCSqGSIb3DQEBCwUAMC0xKzApBgNV
-BAMTImh0dHBzOi8vbWR1LWdyYXlsb2cuY25hYXMuc3VuZXQuc2UwHhcNMjIwNjA5
-MDY1NzQ5WhcNMzIwNjA2MDY1NzQ5WjAtMSswKQYDVQQDEyJodHRwczovL21kdS1n
-cmF5bG9nLmNuYWFzLnN1bmV0LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAs/ZvAEI11ELxZG2QUBb7XVT5xg0d/Mgl+cpMHyUKiLdvHRNDljjeXqjG
-ct/mskGOCb6AUv1YAi/hImSh8MFv1ufSDMr8QZ7CjUZbMYwp0QszGa0ni7xlKsjf
-DROqoPvkI93rN+nHcF4sAeFkrAYOUtkeNKjt0n7kwh8ABjmogky8UfLKVUdAC3IU
-mwHEKeIOjPiElQneQKPhBDXGAJulP+yp1qXFgmyw4ayTHUXMeYQg0TI3oPoN6zZT
-oU4M2dU361AdWWXfqaic4pIMP6OEVPvl78LasXxFJEeUemcd5SduCwk1pAw87kdK
-iOocj1doeerIvNpDGPLowE7CWIps8RYasWY8F7StevEf2QRWHMGeclRI9JgPfUXF
-XJT6bYVStVAaZlXbJa9aAPh8u/6IJQi/O3XuhGohthVQKj2fva+BxgIeZuqfQ6Rl
-dmFRytMAI7MN003PxbP+ItZJHxRcahRB4Dy/xRQ03uP5i3MkB0XmPieOHaWMeGqo
-ssIDjjvwgp9uU3p9fNjjv9a/yOuK8AIpxFBOfI+dBZmOg1I7rgqbZoNSrZoI/eD/
-RipVdKBSmJUIItzfXKS2g0o93WPekxT7ReOxaXbyp3m/iUmJyELaRl5wmTF+2tS+
-gnqquHIK6d0yhHRQcppKtXUXC3Ays8nM6YhDMydCX9KaE6ZwgfkCAwEAAaNQME4w
-LQYDVR0RBCYwJIIiaHR0cHM6Ly9tZHUtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAd
-BgNVHQ4EFgQUzmkf9U9zAwKOCWgZh7jZBFiL2pAwDQYJKoZIhvcNAQELBQADggIB
-AD4wEedshcZoZOI4rzAZnjVrCUA0u4J7FzLeoX4qy00ZKhpSs0gALDIz2h+Wtgqq
-XCrVRhVf8makiEOH2XA+5afWTnUIVOy/qX7j7DOzWuXIbDoVPS15ISuUiLBM+uSs
-IEj7ulae/UxL3XAqwYAlheolGCqjk3iI5xB2ranYQQXHTse0SKNuS/KmeaKwPoue
-REepN5vF642S6XOiHrBMlkW6yPOfczz6A5AKga9nlkSx1NbWnUe6qP838YazamyV
-b8UORMRe70xps4unkz8ldrW8n0r/JvOdTExjpZyooXe86HVaXCU2dzDNlCcjeakm
-KSeedCmdB8S/ui5gg6uvBsIHoSxXwkYOAHWmgikQ9aG+b1jWDQt0yfMeNh46DlTA
-nUsUxh7vkx6V/R47GFXP7DBLaDehdAsTEHS8JaqPK5L4UtLU0Iuorv2u6uPQNIN0
-332Z8CL7fgrY/Bx18mUvl2SE4hguNmFlx3CUmey+hAeEZwqtpMjcjbpnz2uyaB2T
-fkHao73eapUCgdl1I4I1dzPUM6sJeq6rY41oWXNoXWUhGK4LlAWcGvQC03REFpiz
-N5kzg+5KTEtPP3JpaYr/g9xtVvhy2IZ9N/Y2Npm/4rfaNAUqqvsTre3e6ROt/f8B
-b98mxFGVhpYnOxF/zslZ/4F0Vl+DE3BM04ppi8CZX58M
-</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://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS MDU Graylog</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS MDU Graylog</md:ServiceName>
-      <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="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.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>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/mdu-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
deleted file mode 100644
index 03401205..00000000
--- a/metadata/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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://mdu-nav.cnaas.sunet.se">
-  <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>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="2022-03-03T08:15: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://mdu-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mdu-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS MDU NAV</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS MDU NAV</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDU</mdui:Description>
-        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at MDU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://nav.uninett.no</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://nav.uninett.no</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://mdu-nav.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://mdu-nav.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCAxSgAwIBAgIUOowLHafDMzMzwfr46PL8fysuqW8wDQYJKoZIhvcNAQEL
-BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMB4X
-DTIyMTExMTA5MTYwNFoXDTMyMTEwODA5MTYwNFowKTEnMCUGA1UEAxMeaHR0cHM6
-Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAuC5+Dyp766eub9kMYsSb6xd7FTqotqCG2GQxEymnEMB6uddGc0QX
-/mu5bhTBwPmoil5Tx0Yf9MFDh4wFMmQqhltEcr8zuAWgJQmfyYXmU8QA2XX1m4lb
-Sh2wYVhD1+aIC3gsEegcryfMxql6JhIsWsBUN+APgnulvy7npwaenrDv1VYjn8j4
-5XRXqYFbOS/dDCivg2JZXHK6lpnuiOqvNjnora9uwfOS6WD9AVCMtZdaYuk2jLo0
-TL45CXcEGCARudBj/C/0c0QLRCI5fYjPivThl1EIeqes7mDrDfUfGAXXkyEY4vuF
-21MbkD6QhC4xp+hmWuCX1ek4dAvx4Be7HZbEwtFfSF2tPs+pPMR7Wbr2CXdHfeOD
-VHE7SiPZXVVwJILfv0P1Ao67ou3jbtCeRuvKuV6sWDePVMtu6XQfcnpJfro3p7xc
-mfPThFO0GZYTkidqkklN12WHow+vTFRnOGQ59i8+BCMCpBFj0x04BZvnyYWOXrAN
-Jog4jALyjhJtVKIQPAAy604hT0qhN1qoCxLKkRKRVRu2gvEQpYuPoTvT0k9WTBjd
-4gaFCiSin8Y3lSfIgFkpksMBEnfcVtJNG2htKKXTATuXmuat9I+VBTdigCBPlzMr
-Tgw4NibnuihosJoGZn1p/4ll+gX5JJ9CwDFS+MhgY4HhN1E5/H8keNECAwEAAaNM
-MEowKQYDVR0RBCIwIIIeaHR0cHM6Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMB0G
-A1UdDgQWBBQY8DklOJVTDzKZH00kWeyZptlwgDANBgkqhkiG9w0BAQsFAAOCAgEA
-SiHcXxHBZhNVX8TQsnMj9tofono8lWSp3+RNH4sCVldKt9Mymk6lLdp+NSAwS1RA
-eqg7mtkOZd3BpOFtnZFKcTCocQO3msqS53VJD2zoCurnzjLlI1IKznEfw6GWL6B5
-B2AX4ItLGm8VycYf3ljUsCfKcBa/sEMlVGVo8eb1VUrdmWJNoEBPvS9pQNRoRZ+T
-5z4eDfMvBqniHmxmguF4v2v9aixC620sFTZ/ggwe5B1vkJ8bdykP5ITCF4UcCJ/M
-4vGvJbuXvjm9bjei54Ot5az/IvbUcVyThboaFb2e2E3+pS2nYx2k+xMLl70wPFQg
-beXYFlphlMZfOpdDsLFyLvO6g9S7ZdYGljrCDqiMAFK32OYsiI81FQXS4Icdqw2g
-ZXLLdKKQtosbFEzhdWQvobzAE1QgunZqTmy4MCetuVv/2qwbH9PzJnp+OkN6k8Mg
-kuC5RYE0YWieV8eTuCmK9VAbjk3hL80vhwQBDtbUMx9ZNSAezEt+e10fvYiw+xOl
-jzFg2EOoZNFhjZNALE/JCPYr6VMv16eCmURo25vE7U31sJnORyLs+pCbBRprzSpd
-ZaCP3V1IqZ/OnGG19co5sS1MDwh6Mdfui8fizt+ZMXisfthDjfVHFxaiz1DP5g9d
-hzESbKUtry32f5UndGS1iWU7Fr2zvh6atywcB1Jg9Ao=</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://mdu-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdu-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdu-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS MDU NAV</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS MDU NAV</md:ServiceName>
-      <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="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Research Council</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.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>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Paulo Pamplona</md:GivenName>
-    <md:EmailAddress>mailto:paulo@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/mdu-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/mdu-ni.cnaas.sunet.se.xml
deleted file mode 100644
index 0023e912..00000000
--- a/metadata/swamid-2.0/mdu-ni.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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://mdu-ni.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-06-09T11:54: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"/>
-    <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>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 Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS MDU NI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS MDU NI</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på MDU.</mdui:Description>
-        <mdui:Description xml:lang="en">Inventory system for CnaaS at MDU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://portal.nordu.net/display/NI/NORDUnet+Network+Inventory</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://portal.nordu.net/display/NI/NORDUnet+Network+Inventory</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NI+when+using+federated+login</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NI+when+using+federated+login</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://mdu-ni.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://mdu-ni.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFHjCCAwagAwIBAgIJAMC+OMb4HCVHMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHWh0dHBzOi8vbWR1LW5pLmNuYWFzLnN1bmV0LnNlMB4XDTIyMDYwOTA3MzMw
-NFoXDTMyMDYwNjA3MzMwNFowKDEmMCQGA1UEAxMdaHR0cHM6Ly9tZHUtbmkuY25h
-YXMuc3VuZXQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDaHskC
-Xv0Ekifko1hQWP7hKlMLdOmm3i3NzxkL6ibgeHdgL2JwwJkrHCQ24qx1/YVtX6TI
-aM2rtoapRr6M/rUU/VET5DfFdgw1d4KDpkrWus1QHgeAYQeLXwuTBCsQj7NKDvC/
-dd34LHYsJW+NV0Y5442t464p9Fa9DnuVkS8HeYoZWNLnFrdeGqkD1wuhbpEXTgOL
-GWFJEqV4cnWRlU3wX98xdkZ8WTNGNesikZl5mamBPstgFZzFXmKRTVpKcDnoDcS9
-0jcS7J5PFnsr7HrHcgl6RiE3zwDWfvQJJ5ZVH81YnBvXpDVKv6xaaGm8n6uVcy6G
-67HbQmHqeOg33tZe3JYNuDzGtRuew/wBIAUVwDr8ffP2GH91Gxf+2EQQppDTN6M6
-afTZ4FRvKbRir5HrJ3hNYQgTYCj5GO4G0KxcZuRUt0iQaXQtnaG2rUiv8qy+gcEA
-YH1+J4LrqHuM58lr9gnkAJHxM5hjzrwAhkrXRj44WzjU32nu2xJM5bYZL2SSpJ27
-ol/g3+1mKcMpSsiRUXJ+UZxaLptYeE+Jz6MTY3OaZPB7HgtxH8N/ATaTqjzFQPEI
-Qpktq3t37gLh6yMOW2sXcvL+PqmQlT2T3GlGwucxL1COQfePFsGS2EqR6Iw7KeWj
-9vGq92ZgynqYKPwrZ2jYq8Sb1GC7CzvVlNTRTwIDAQABo0swSTAoBgNVHREEITAf
-gh1odHRwczovL21kdS1uaS5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUYxV0t9Mu
-4P51+qI1OCXVYTCT8RAwDQYJKoZIhvcNAQELBQADggIBAG3Qym8ea75y+JJNGJDe
-rVRgbH/KCDH1zCZMs7gpOrb+BKeqcB8JA0PpbvWH8KawCsx1xUUDPcBcsFzFwbVn
-gyfL3bsGsWRPVinMesHPj3tI9bV/DvXhenwou2khm4lpkK+ADpjNf7MlwGhDTgQV
-5TSt6xVozhqC3ggmyO8q5kPj6C5ADwyj9y83rR7kufYEpvRoAXyUWePDK/tZbagF
-RjxVu3jUT0XCt2w/YdQmo0szWRgSy9V2+c+nhoqh6FbNE6PCrI54kBrENed/rQl2
-QlSdtdf8g2HprW2ywGSnET4vptHC+JI2lGK2yC+wTFpx+jX9vN7eKTubqUvtHKKq
-uL1HPkQJBl4SXdp9IiR6QqksPp/2j6buE1gY+Az6cKtqOJ17JqmNRDeIDkgX1cqz
-ZYPWwWt9ZPZ7rg4s02h3YDz3RrD59JLNv1ropiYNOBXoJ5jPiQUFaqdzbw8fM0ec
-R0PHo0RLntklxQK/PCJHPpGZGgsG9IzONFjmxRi3l2p0HyF8lr588x1CHm1IKyqx
-Fh77o+XkfnkHaMYoJEaHVWrjj/86U66QfLrl0JN7IgCUt94eJCeMtVHoLPpG6Y7O
-DM/Jeo63gmJun4EESV1lR9QXk/PQMVcGbLqa8k8rRKM22CO9Yz9HP4dNlnHcsBtn
-qMhou5N3q7Sn6XIZhk8AlS2I
-</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://mdu-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS MDU NI</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS MDU NI</md:ServiceName>
-      <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="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.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>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sunet NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml b/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
index bd868ee7..d4302db6 100644
--- a/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
@@ -8,29 +8,29 @@
   <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Uppsala University Weblogin2 TEST</mdui:DisplayName>
         <mdui:Description xml:lang="en">Uppsala University Weblogin2 TEST ADFS</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=838050670</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=838050670#persondata</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet Weblogin2 TEST</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Uppsala University Weblogin2 TEST ADFS</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Uppsala University Weblogin2 TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet Weblogin2 TEST</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=838050670</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=838050670</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=838050670#persondata</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=838050670#persondata</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE6jCCAtKgAwIBAgIQGAqTx5HrH7ZGgyOEQIFV8jANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIEVuY3J5cHRpb24gLSB3ZWJsb2dpbjIudGVzdC51dS5zZTAeFw0yMjEwMTAxMTE0MjFaFw0zMjEwMDcxMTE0MjFaMDExLzAtBgNVBAMTJkFERlMgRW5jcnlwdGlvbiAtIHdlYmxvZ2luMi50ZXN0LnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxHSX/c6xZHhy3iRbk/ioYgOkofoVPpImLxi1CfBiCC6+R9N0nhWgklO0mT4LJ4YzwPzTaPv+/ZLvvk83Bsy/PQAhwIyG98iAle+evKP/PvENXWOSeWKPl56SjKbhGe9Pq113FSdjbHRed9Bgt3VhysaYcv/d6JT675N7K5AMTEKqDLVm5HbLKZG0AXUYU/vMvvheI8A/ALrnWZbx7DXbC4F+FlboYr3+RSCgu6SQkZIjr1vtSATYNULZ9aenuF2eKNiW45jTC92ctne5V2LRB1aS15bVSmbB7AVK6N5Df+0zLDRvAPGMnjM1RiEFLwpxLvLuRHgvdVPgzd8U2COeJcc6FGBapeBTgvE1+ROJXHn8wAmD3M5aFhpiaV2M5Ua1ukQFT+55h5kujnSlB31272BJzMuNxelqgdpzTNDhzc30fV7Z1i/cmvIH5wnTX+GFR+ktdBu/G1ZE65NMZ56UKlyTy+7imgK+EmCq9hw1bCHh0CVq59k4Zk5NNR1FreXf/U1D6aHK380e1nwDxqUBITJPcbgnBC6am3sCR3lF5ldiRnzohnCMisTPiwwbtqAnHMp6vdqu2WAQNTBYHEXouezKUfdswEgXpAvjlBI7Qso+GSDqDlpd/84pNdhJknTw/uNLMtMRpVB6FICG7T0U4LBEru3hRaq6fDH6gvyaCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAC/ACo1AQ5NQqLtv3Hqgx7eE6aQLTgumMgT9TJ//EJBl7RV9ylE1lbmDGSEMPYGQZLqnq84fgvxEtqe6BeGLc13V8zldMxZGAOYfQ27t09aNGzACVAAAQyVTzwngtXu6r8Whj7QGfyTX4KLU40Zqbm8DlUZHLOGCVvL/aCNzmiz0oq3IoKh6O2xPPNmuoXv/Ch8rccihV/uD6cOPfFZSvYVxMJX+J1uoS4V+Ja7Lkl5IRb5GMlxBnT6rNVXpV/TBZA7SU3c/YkMhd7vOTAhKqVzVxIax+t16Mhxl/+nQpmbLCN5Pq1vXZPbX/g9xX/cdceRyrWNDcFIRri+2qicnYQBbGGjeCE7Pwqz4jPuhBU6tWY6rKpRfbktBViL6lNlJYa7HJdQjSog9MhpOH7EMDGOqi/bTbEX7nrXmdgASWqlIUJ+GmWGdkdWXo4VeVeTotIv253kRt3wirxvvuGIw8fmeB7DxoSb8eG7q8r3dwyWgM++Yat9q49NjJZHkPHBTkFvNp+dwBhAzmDCuO7P50xa9J4YWvr+TiZ3H6udILPRi03pywA7Utbw/7bWSIP8cDFxxe1L9K2llq1cdFa+i1qkQs6swO73SxzWVtomifRXLezwZwQoMLYV+OaJsmR5a6/Ix+9D3up3xhAKNhrlxHCEgJ3f/tSn8LgceNbvQhPyE=</ds:X509Certificate>
+          <ds:X509Certificate>MIIE6jCCAtKgAwIBAgIQad4QtPh3r7pKq7EJX+1YEDANBgkqhkiG9w0BAQsFADAxMS8wLQYDVQQDEyZBREZTIEVuY3J5cHRpb24gLSB3ZWJsb2dpbjIudGVzdC51dS5zZTAeFw0yMzExMjAxNTAwMTFaFw0yNDExMTkxNTAwMTFaMDExLzAtBgNVBAMTJkFERlMgRW5jcnlwdGlvbiAtIHdlYmxvZ2luMi50ZXN0LnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs8/WCUr0SHhVkYyprdMZxIoGalIO/N9Jv6GDutFXHm41Fmav/FkLr5+VEPmfOnYo85ry505yDJKzU00BuLEZnJZyEVkLDl6OTPY6yMGAj3jwzJGX1YENCjsQKJJ1YNXfCWs891PXGT8Zhgtt9KlBSRoMQzBwjRf+mEkuyaQZ3qqOQU7alnWLE3ZN7hbZrKW8BTlDM2GnGcHsS7iV4wS05RKV8EQPfnGgEBw+hY1k0pLQpwSymMvAbDoZmD7ndf5fzuVcnaGJnI6S2q1D3u12FAXqdRHj3Rkn+Uf1TpZQKXnFvkxEGqY0qateOUiMfQDmMh03z9bw6ZmvFXUq8YZqAEqtBjriSO1HmqaS/qzviYjP4hwgs/dyLoVAkDi3SRgRBaOunviRo4KBpT7WT7PjuvY8KxMGjdSkQIBarxhfV1zr0jfZWYamUAEFUrLESmpZCCn34KVcS9qkAcaOgEH314k2IhUM+fvnjjtXsmfPwq52NYyC5JpccBs5ekBu9AfQTOF7Yn7eUei7hF33i9eLEasm0OnwZXSIwOt2HMADvjhwObY1SzTdxERbyWi6r+3/xgVpa2GfEo/WbVJzbgkwh6BW/PcaW6iL1lvv02B2bTj8o0bmhRqRXKnms5CD7x2RNrZk7QjbC0XlQygMsxlmF0pInu4QE2hWCJjSt4mKaWUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAFeyNCTSOw62TxyC9SysVATQOUFqfAdmlQL/nYEWvj9QAoJIRC4k5nxPPqsg9hrhZNrlOkOiQthrWEhzlC0QgMO4FbwzYQJ8UmZIrF/NyyI1y/Uuucmg07Xmp56WRbdOuP9cLFcSSz7OI0ct25IksFPwrd2tNK95z2SaA/X2j0HT7yJPC+WF+0qnN7FA3LTV8AFfVZcYpIna/fWTpI+otkxoE9LfPdR3+Gxmf0wCP8USEv+5mdw//Z2ivUcuOW6sDuV3ibbriw+RGZzrYpkOjVmKFDpT1faJeh8ol3fNCu7COZwNayypWrXJTNyvqr9TEB0J0eDRpbAUDeo91Xg1nqAZl7HcUFA592ark1G2XqKQU80/z14EnQ3DlGVChaHYB4NCtdUxZGhQLYHLnVXQHUk9Bj8nd4afoX/1QCDlZe/FPgaJMDgwKuFi/YBOC7/PUrK1sO6mwx/47DgOXoG2uqU/sZnqSHIUNakGUs4AD5ZlZmyPEm7yovGxN+0ikLzTbsWDPtaCqMiA9R/9m93KOpACYSdD7nTDtnwf3IMMU3/0gVXTMNd5jGxD+N0qeXhonXqvuBiO58/hDNKjRm9V88Mm0+3yQjUkNZZd1yCq7dWhjN6UNCkOCHTej264y4dxC885iN1KFJ8IXzeP7LVEho1vZaU1PJj62J0cvYDnMVM4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE5DCCAsygAwIBAgIQPate/Lcn/axFmLVIRJiPFjANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNBREZTIFNpZ25pbmcgLSB3ZWJsb2dpbjIudGVzdC51dS5zZTAeFw0yMjEwMTAxMTE0MjNaFw0zMjEwMDcxMTE0MjNaMC4xLDAqBgNVBAMTI0FERlMgU2lnbmluZyAtIHdlYmxvZ2luMi50ZXN0LnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw8EvZ1TSbiF84RH1rvcFt/lqMr/aAhMRTzYLiVrNuzyR1ecRi9QKoMGasNPbiVBBHwMMO102SjLPsRuGH1DG82VROjYTQ6F2OlaRqWXqfZzkzZm+06okh2pi4KTL8/P+NB9ai6MuaTzUqqmVBHKi662f9F+WFOiQnya7uoZcvfB8R0pC6m7Ta0P0AzGVSJbajfu5nU7P0urMW8tqRM10q8ni4Y64O3Oter3CH+26AIIPM4xznJhhwHwjT0qRD+nfdQz7eefjUZy15tNbxG1th/liz6DEk6Eycm47P4QVtVsTocco9htteV6V6I556VA4YmWrAOKD89/X1aK5CLzGwjfZGLaHta8TQIOukHSqXP91kxGNai82c8t9eCu4uLmfVI6u3cHNL01bojFZJY3Kq1QmE/tMUw88M5uzhwQ+D55UwT0JJutEzTWKJ8T0dW3EXmnUiS/j9F/YQaW5I6AUJLxNNSpgPrFNQ7dTU4Y+Qp9v7nYiXuonjSuxy/NHnPSd7VmYbDaXaRzMb2Wsyjg/MGAHP46YjYCOdGO7vv1zmzzzYTuA0qljf9qE82QEMTh4UTNEA/1YC62IAhCVqiirbZSJJsFcTY4yF2rLzkBmtGhjWadu11Oo8Zl1OLAejpznhpwW3sIsev6Jub9ZGLK8lzbhkbmt4+YJHxuQfblcyvECAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAKZsT5ZUmx9j3AkBu727RZ6Q1xCbElCp1elYy5MTHvNWh5S0/oPGp63enVinTQktx+BRw24DoVhVXiBrZZxm/dMbxeb9pv+MYOru2n81KFky+YL7rDttCF0qUWxL54L0Aq8hfAF8yn3scXVBqkR83lStnb1S/W0FTe74HSQWDXTVUgKSo6OOgxotg5KCNf5EFzxGHxfqcwAAcvlxXI3Sl4r19TGYoCEMyQJs5/4B9cv7mnZZNtEhMurDY3uozz+wdqVA0oG2GB7gJb5be/+UnfFv5Zimuo+e/UHIZMg4W3zeAkZCTA26psNHsZznNfeYDYqdYNMAQib4q2t6vNREPrsFK8AlMpGSRDWonx9fwrHXCUNP50NFyCcILbuNn2Yk1LjxLPK+PsZRSx8gFs1hZ3eeA9ku3ccpaGupEWws4zqM7NDrQBN1ay/r/gQJ7qyrPQ/+p6pkd4gPQC6nYL1s5qtoONpVskgKEr8XlxqLV04eEuKSVuKGYx5YeIP+uQTaxSROBw+soy58BCvPeWFi38v3rcE/ONhktSfA3INg5A3th9aVKurR8MXFdh8YQx74q2Ro5du67NdveBh5y+jXy/6UbwYXcoOfs+mqJE8XDZv0KgmtHlsDE+9z+ynKCsCiTfeCw+vt0VOhB1JbNjuTUH9gF0iP2mnmy5j0I86B4c+U=</ds:X509Certificate>
+          <ds:X509Certificate>MIIE5DCCAsygAwIBAgIQUUMU5er6BpVOsLxcZHb4WDANBgkqhkiG9w0BAQsFADAuMSwwKgYDVQQDEyNBREZTIFNpZ25pbmcgLSB3ZWJsb2dpbjIudGVzdC51dS5zZTAeFw0yMzExMjAxNTAwMTBaFw0yNDExMTkxNTAwMTBaMC4xLDAqBgNVBAMTI0FERlMgU2lnbmluZyAtIHdlYmxvZ2luMi50ZXN0LnV1LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsuyy5MbjpBMTgWCNvE3+kDgo94ZTaorw66jhzYDBGSUpwe/X8GTdLySbEqZfsKCYovpLFh2Gz2zCfO4p46nC/Ki2llGGazXpiDYur4GWeO8rHp5MXfjjyWTKPyXcmV/h4k69oef3TmGVICUwBF4v0nA1jqIBsccEambzYXOKDTyk6idwv1bOd3n7D/45U516wWLs7atdazVsN/gQO0odwZUe2TKLHYwdigEdWlkGyW3Heudq1oiAbM51jmMjbx335QyfAo7ya8yHsDNPy+hGgbTDqf07KOfwVbByn+FUuBvyc2VRfdELCCkk7BlW7MLQ1pkGhyLO1wRjvOxGh01lgW3Excv6D59siKmpjutSKyY44ySk1No/k/E8JZKYHlTGCAnVtkHHHqYKGDy/0Qv6hOj+fe7EPKTQXX0emNiT6vmps9zbHVFKP6wGrN5olW/FTTyxjTbbVjl4nvrywA4k8P7Y9yh+NLqrhni/70tQLse45zWMNbm2MLljD0RhedXPS99uHAI/WGNdXwG8pZtfVBwXz7uwL0GgvAkesL9retKHVnKHHjagZ5rQvGOGJo1xNzYYqLdZFjIkVpqFXx+FdRwxLUENG5g6omJbDyUvanO0nlmzr+yOzM/XCNPKXVCmQsmg2Sw2aqni6i5eR2zsoeWtT+ZnqdelkLC9nsxfvh0CAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAaPi8X9KPv1mu6ESpNwNqsQPNXzv8yUlI65u3bvAa7GePKb7hJsj2v1qmkWxEs/LitfROLGQP8SPhZhvjaciPrYNciOeKmRjXeuyfoyIpl8RN3q+liARorq2Q3VccbzFzVeLyU8lgAzx2p5fWSO0+ev+l9THJupbn7i9xoEh/+uflRdn7RfmArpEDMq4fANIAENT1mFOTYw19k81cwQ2jMzDDdo1ScPhUNQiVB1hhCmWo/LPMyQ1HtLPdNp6AvOrXquECfyWSQAaT2Ex4XV9YfO/muOJ77QNMIcZ7q9GiTFIlCnkkGWE0qPBlWNz+Y49KUD6kIbjFQvfUA6f3xiri7yiIKMWF0FpBaGJ1bZIppiJzhaMwviqHOMUW0h+bGCBtEAGWcy8xFFFU4UpVDyZRy4JzLIgLPieRvIitYxmyLGFq5aDuLj4vt/APbBjlBheYAx6MUyztzclDMt8VtEotQvJY7zAA7NihrNSRQ5dbl34+XbVItwADZKCYtHzGZYjWptOfpJtxe7PVg4RBTBq7YopoPA1FDLuTbMUGx4iWCFjhzszW5DU/uVhaO9bJYcHovaAMl3xYMw73BuHqvINVxJROdyWu3hJt0qYTLYtpkmj6ysjA78CgGNl82t5Ts9u5S06q7h+4SrxD9+S67Ljo9gxJPQVklIhZWOVxye3xjdE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>