SWAMID-3422: Removed 7 SPs for Cnaasmd-2023-11-13-v04

7 files changed, 0 insertions, 859 deletions

diff --git a/metadata/swamid-2.0/kth-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
deleted file mode 100644
index 955e8c25..00000000
--- a/metadata/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,122 +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://kth-graylog.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:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-22T10:22:24Z">
-      <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://kth-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS KTH Graylog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS KTH Graylog</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på KTH.</mdui:Description>
-        <mdui:Description xml:lang="en">Logging system for CnaaS at KTH.</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://kth-graylog.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://kth-graylog.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEODCCAqCgAwIBAgIUcV5WSPAOY5fqR9/9lyrpBtfoUX0wDQYJKoZIhvcNAQEL
-BQAwLTErMCkGA1UEAxMiaHR0cHM6Ly9rdGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5z
-ZTAeFw0yMTA5MjExMzIxMzBaFw0zMTA5MTkxMzIxMzBaMC0xKzApBgNVBAMTImh0
-dHBzOi8va3RoLWdyYXlsb2cuY25hYXMuc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEB
-AQUAA4IBjwAwggGKAoIBgQDPUr257NLpLAU5MIKTenE3pWv10SKZgVqtBUlv/aHc
-ER4yMPQZ7eGDDEDG+h+hrfNvwZG/2++hQD0uTeRcnmae3yFpS7CADv1lRxa3Bo4y
-4dIKVjI9N13v0GSESTkuwv1sLww0LZVyOOXEStGHBv0Y4eySUuWloZ2iurQlByd6
-qmbfUwaLDij3YGiySm01R0rv7T7pCLZjxM9HBipYjLAUqZiLb4Wuh16H5nOlHLLU
-psAWU+PnzP44WjBUfYwToOf7It9uAtNqZQjbBXwhFgoEeBVIAtvDBbL4UXti0nIU
-vYWUT7beirIlkr8TLBfTshzirBtyowa+UtSIeyBl8pjLX4FQc308Ryqiq/bIy9an
-wYMYqHkxJh7aVkHl8jXyymz0furVKWU07YwaZHFKjxLgMXz0JGiO4KrO3QGTDOlQ
-pkbLjkxjue64D01I5YNiSrGoRRQKAMU04fkBLfIaXoOUBdxClWaNIRD3otB5F9up
-mKNb8IUmL2ZhIZ1rG/mKxhkCAwEAAaNQME4wLQYDVR0RBCYwJIIiaHR0cHM6Ly9r
-dGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQU4XYPZiB+4dUBxcbJ
-xDOSlwMR0towDQYJKoZIhvcNAQELBQADggGBAGvxAFYWE4/rQL2j34AsZGqCFyoN
-MheuQ8cwwo883ZaQzTEeDmUHpOrCDQSqj6S9kSEdNwKWGfK7Avrf7D7USfc6KG9R
-cP/rFjR7G+JNlky1+y+dIZjpK6mJhqiZYVLAbrobH5I7O8mFT5MYGiR2GsAfb8x7
-/Z3iS+fLfSfrjEgb5mpZMLK9WLpziijNQzV5flv08O5TNHlZ+qDYR2gd7vty3jIp
-ArgXJT+cnyxrIHS8xK+SDA7EXO4TXgSaKUwyXxwOtriOCJj85v6qm/jK/khpiRV+
-7ViHsZvjmhBpZB3pqV9SqCSe1fbz4L33izokxUzqTkSLh2LeG9P1H92Ub0WLr95L
-ra3Y3sqZtwkRQH0c2QW0WGXwsVLRACK9OCX87shM+4QxvxMrgjaJYjh/hmC86iHw
-5RJtQ7RUyU3ccqJKNQwdb+NoUA/9xMINAv43WmIzwMq9X7WYChomm4yRBOARW4OI
-/r4Qd4D/5JvQpwAGHFkYi4YUkFSqH6ca7xMKQA==
-</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://kth-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS KTH Graylog</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS KTH 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/kth-graylog1.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-graylog1.cnaas.sunet.se.xml
deleted file mode 100644
index 28bab9e4..00000000
--- a/metadata/swamid-2.0/kth-graylog1.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://kth-graylog1.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="2023-06-15T08:00:52Z">
-      <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://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">kth-graylog1.cnaas.sunet.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">kth-graylog1.cnaas.sunet.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">KTH Graylog</mdui:Description>
-        <mdui:Description xml:lang="en">KTH Graylog</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://kth-graylog1.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://kth-graylog1.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMDCCAxigAwIBAgIJAOwUybRu0lYTMA0GCSqGSIb3DQEBCwUAMC4xLDAqBgNV
-BAMTI2h0dHBzOi8va3RoLWdyYXlsb2cxLmNuYWFzLnN1bmV0LnNlMB4XDTIzMDYx
-NTA3MjYzNloXDTMzMDYxMjA3MjYzNlowLjEsMCoGA1UEAxMjaHR0cHM6Ly9rdGgt
-Z3JheWxvZzEuY25hYXMuc3VuZXQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQC40dHEzOnAyBNnrpRnWx4V6uYcozCf8AFjR9+scTRnW5STn3ZqZfDQ
-YlzP9QlLRbwfB64qEaT1o5SYL1hPT3BCgjJ5aIPXViRBaJRKDy94NcToKgLplyw3
-J0/XP6KJvU4VQSGoiq0ettG//vmMYA4gqRzNaN73fy5DJRhyNPLIUikzbYJAgeP8
-nAywv2D3BQixpipVQnMT7fSmxWas/wFGHvRcaRdQoXbBHmwe+PytmqMH2O3QuSPu
-ti6J9G5ojmjZOiWHR1ZxKfaYn9fcU+V1hyveK/VAWPwiONep3D0hZ8bMJ5MtFaJB
-fIiD1gTOyXhdxVNVtnbUlFLeaTC5ttsN2xWxsJpFmIRcGOujszCirhFmwmoW5k01
-4yBP1GSDKvG7uT8kAo2y9LKfqayIQWIeNHcM3aiLHfGEMBCRGDBOVZUBKzF3Jsmf
-wyJuCVfc/RIXpAA7kH0k12tXPlkRUhnltjlWG6acXhDMqffx2tax+CJNahmpfBy3
-Z25/B4PLNfeGrK3CjwCz3DiBnGl3Fj7b4zWmtKXjpSGkOthvsignh6gAnRoPczf3
-/0DDooiszbvcoAr5Qxi8psn55l8UVEsihi4SyZQUf4FVVIl5hHTx/gwecjt3mLCs
-EbRsyWk8sNcKSmwgO6CnCNNIkE8FH2OnmWnbGWPQSTpboWFHqMlfNwIDAQABo1Ew
-TzAuBgNVHREEJzAlgiNodHRwczovL2t0aC1ncmF5bG9nMS5jbmFhcy5zdW5ldC5z
-ZTAdBgNVHQ4EFgQUiqEsaARhmJ4NI4MCzS7xn5RrD6wwDQYJKoZIhvcNAQELBQAD
-ggIBAIyFM3aNyHEWcIL1D6CZh2YdLgP5Okl7K2Z67VG23W585Q0kRWRSMBhw73DO
-jmRmwtsPRajBumMVyz7SA7Xdfub0MMBlvA7sV6ciUlaoNpPYJkGdcxqu+DzZEkdA
-46nfa+lq0qWQxxVmxbwWc4I4wmIAARGtfBJ9MeJxXaX76a8gtbw0Fe889EiIXjFN
-UPh2p3Adh8sv8GbTY/lxVA0IxKHmwGysTOmjsAojpErEdNIHH/y9ZAqo5rbSBakA
-xBDqPzFq5a7Q3AXPqEK40E6TqAdj5wqSyq6Q03S0mkD3TLdONvpRME5Lj5466hXO
-TpJHj+6xbsAJIgNagnBqr/a4ijlushOgnlqfWG6XjYjvaeS6pbBqgLSQblxMV5rN
-D0bfs5ZRL9KmIF7AwKIFAaa5kXWr3u4vNsbPmWFbL2eIC+qEQ9oMctFgxi4EMTzk
-0kIIrkig45AyLk1Ic3kmUkFbNTEFZL8w9xfIBk0NRhFbwGHUttPbN/Acr1dH8jQL
-J4RHgkYSU4aYh9e4KbDO9d5idcRBD+yPIL9I7IIxadEjd9MEuTCmuvP061GTlvmh
-dyBFZ/QyXk4oRJcHpXd2DGkqkUA1AyFT8UIAABAjcFv8pAiJa80zrqixmGXZxRyI
-x7YPw+TP++OzXoQdw0OVrphB3N1Nm0mlq+TwVgZWJbU7/c9b</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://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-graylog1.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">kth-graylog1.cnaas.sunet.se</md:ServiceName>
-      <md:ServiceName xml:lang="en">kth-graylog1.cnaas.sunet.se</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>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/kth-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-nav.cnaas.sunet.se.xml
deleted file mode 100644
index 095f22ba..00000000
--- a/metadata/swamid-2.0/kth-nav.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,122 +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://kth-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:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z">
-      <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://kth-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS KTH NAV</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS KTH NAV</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på KTH.</mdui:Description>
-        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at KTH.</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://kth-nav.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://kth-nav.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCApSgAwIBAgIUKvOwV/XMYYQCKW7B+NFhl3ZBkLcwDQYJKoZIhvcNAQEL
-BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9rdGgtbmF2LmNuYWFzLnN1bmV0LnNlMB4X
-DTIxMTAyNjExMzIwN1oXDTMxMTAyNDExMzIwN1owKTEnMCUGA1UEAxMeaHR0cHM6
-Ly9rdGgtbmF2LmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
-MIIBigKCAYEAzcUjpalzYkqPWBEmvLuUMG8h4/iOtfzu1nHtLIYRfTgJn5NJ42sz
-G4ff5vYHpxk/ILmsjQwmQJkgdxibKlP3eabkAwpzwuex3fo47cdtMuivPJG0bcIb
-UpG+4NoEjzAJZ9s1jrVq8hui9G5bPaAXyHug4aMvyQXCiY+2VGmfMMbkeshDs5h6
-y8ZXRxiydrZ5VV74gAdSkkfFR7ft2BIPSBfR68JI+ijtUYy4qD+jSdchugrJYItn
-lbGq3RUEOhwmOb3Garkk9tH+wDTGkafZMqWcNKpNWNN74ChkAz6Ytd5gVJjS1fr/
-mYIhMQhEmeN9DViZo3E7MgGbXny5seTfE2DhOBDxy2pdINshOy65ZGUhTeaAWvCT
-hegW6IDZKT2mWYiLa+MjpKFprHqeQXblhRbiQb7hfvv8zwBiLqE0UOdmdNY3VXTn
-/8PURh0XZ44GiS1DOADxoN71OqC8gcVXt2nGeLyUOwPn4zrNnp39wsq/3fhoMykc
-QuvbmDH/911tAgMBAAGjTDBKMCkGA1UdEQQiMCCCHmh0dHBzOi8va3RoLW5hdi5j
-bmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUkt4LlB8V284S4jR73Hm5pS0ct08wDQYJ
-KoZIhvcNAQELBQADggGBAJ6LHReTZ+T1RS7tvjKcqD0z+cQceGM4xlKk3DVw9EOD
-eDhJw8V0QP3rZJfPFoMgNSZi2waJRYr47wO3f0DW8Hx9hBpo19QLzKXKF6/Vh3YJ
-f64tyh3vsD6xLF7L4UfXx4EfbCyOHP7TFHCHNsyRecD35RFO+E4vMsMwE4osaO3Z
-+UNHF4BVEITxlAzBIRTTrrNwqniaaF8tTx1xyQTYvogRME/fbhbnytqHTfbg8yPJ
-WeIz2iCdQoSdk2sHhCa8YECujNsg94IYhE09DZ9JjOmEdluf6QzxRqHXdi5iR4HC
-Wcvj7rbnlhOPVq5baE3fBn0MQr+uo+CIBftetmv4HSDynxnpVLNjNKPor45aRCqg
-jgRoLczkEeqbANz6AiBYu7BD6LVWnglLbcd6w2iwpuZofTLEgH7rpt4vugRwcukN
-sUQu1UbTaCF5Rb+kgFXoePoO70wXQ3rLFLNcwtQnbSPBw1cHoSSBPwcwblSE2jSU
-AISFtyqcxrhuLJJ5YElANw==
-</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://kth-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS KTH NAV</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS KTH 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">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/kth-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-ni.cnaas.sunet.se.xml
deleted file mode 100644
index 47f007e9..00000000
--- a/metadata/swamid-2.0/kth-ni.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,122 +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://kth-ni.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:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-15T11:27:53Z">
-      <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://kth-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kth-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS KTH NI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS KTH NI</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på KTH.</mdui:Description>
-        <mdui:Description xml:lang="en">Inventory system for CnaaS at KTH.</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://kth-ni.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://kth-ni.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUVbeWQb2aGO+wYRw64Gk+HVpBjM4wDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAxMdaHR0cHM6Ly9rdGgtbmkuY25hYXMuc3VuZXQuc2UwHhcN
-MjExMjE1MDg1OTE4WhcNMzExMjEzMDg1OTE4WjAoMSYwJAYDVQQDEx1odHRwczov
-L2t0aC1uaS5jbmFhcy5zdW5ldC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
-AYoCggGBALBxyu1NeLRXiHf8hIHZtPlyQk7Dt5sSDcgKTbdrtnghqoLKSG28z6hl
-l6+6spIeCOZfpPdh6OfiELRUkKc7tXP5PfsLJQkoqhOHm3Q2ecZwGthwbQtV7xfE
-J/7NDKRXTj4OoN3EU5Om2nNFszdvJtfD1M6D+scXuN6QcRDWesZpVIto56tXhSx6
-SDGC1gdffPL8XZwTpmX744/JN6ul6z8TO5BU2f5+RiqcSSkkMSEVPXBypbiyI2Ot
-+ojOUBCfSkrYMitBBoj3DPf9f136JmVRawZi/A3hzOEB6b33dE7+/rOfmqWjZFiG
-VQoX1p0j4X2zHGFbd3OePikizeBcghVGoOuSOPz6hGjmGHw7gmogwNq6I5bKQHEW
-+L+D2QlICw2ypVApVERVnb6BxuMgTbdb8lrX5vvb0DtnoGrz6tULbd+oDfrY3gGV
-5G586tIKBJ3BIKdokHb1ZwoY12LZlFM7XUv5VyDO27K8MwXB699Rpo+ZQayH23wk
-UKO8ZxYtiQIDAQABo0swSTAoBgNVHREEITAfgh1odHRwczovL2t0aC1uaS5jbmFh
-cy5zdW5ldC5zZTAdBgNVHQ4EFgQU72kxfDfKySu5jE3b0bqj1tg+R5cwDQYJKoZI
-hvcNAQELBQADggGBAF+xRpuyjdgZ/qjybMXVA0Mg7an87EkgrQIfxCM9xgZ6M1M9
-3o1JXCO6IwFx4nEhyrZocg9PuZ4mlpoueQPFBJWLgxFA1tY3IWb/hTfZSNO1zyjr
-s9M9WLGXw2hb0WLpwVXXfObVmpgRD+v2co2RkQ24mMaZczOSWDNs7K7Bn7dVTxXR
-UxIT+cKlE+7cDQqoUApDiw/90YzT8grtrYv0nqXGs7VeIXHuL7XbLE1skw4smR+Z
-vk7m2RV0iu9bPcucjH2xvskBDAxHMWDsVEWKO089nlSymrINN0u20xysAT18JDsC
-Bs/5omtibp1xtw7toartV21911esFtXd8qHoWjr2Rb3cS7Mb1AbCIIpQ4P6tgeKS
-ZIJ9xVO4IWOhdNxsmZHVeUKoE/C0bRngvFO+SkwOv8FJB6R1WzFMp/GcmashYS5S
-5Fg6lFpKqhN0K/JAtoPXlHywrZC6s6v0DYAh8TyIkSd62VNXvbBYt+XAFAEwc3Be
-/HAwqzru853o4EvyUQ==
-</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://kth-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kth-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kth-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kth-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kth-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS KTH NI</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS KTH 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/vr-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/vr-graylog.cnaas.sunet.se.xml
deleted file mode 100644
index ca13ff5a..00000000
--- a/metadata/swamid-2.0/vr-graylog.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,122 +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://vr-graylog.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-04-11T16:19:27Z">
-      <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://vr-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vr-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS VR Graylog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS VR Graylog</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på VR.</mdui:Description>
-        <mdui:Description xml:lang="en">Logging system for CnaaS at VR.</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://vr-graylog.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://vr-graylog.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIENTCCAp2gAwIBAgIUc+OWQ/HvMHq60VytGy8LurM8nsAwDQYJKoZIhvcNAQEL
-BQAwLDEqMCgGA1UEAxMhaHR0cHM6Ly92ci1ncmF5bG9nLmNuYWFzLnN1bmV0LnNl
-MB4XDTIyMDQxMTA4Mjc1MFoXDTMyMDQwODA4Mjc1MFowLDEqMCgGA1UEAxMhaHR0
-cHM6Ly92ci1ncmF5bG9nLmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEF
-AAOCAY8AMIIBigKCAYEAxUQNmSbDLJxjyMNiTXtuuBiJ2ZXiG4e306N3exjRGaft
-Ozu3XbpDd8ctLD9bJ/Mq7XJjZwBOg4IBBwqtDqJan2tzjy0uuI3rYA+q0WpNEOre
-5IdNa2DO2ZuD6BwGv4/V4aYYYd3fUfOhnpYnW+ouNysvD2B9g5fxG8K6Wi9mvMW1
-w6SNQlbOx5wXi9D8wbCO/YzCqNS9pbz7Ctv4VdzB49p/CuBvDUWD83zEyDzv1vAc
-mrvMWEdpo0u5fos5O8zpn3bYyzuOyLPCBNQy5vXCg9zqOEhBy+DUpt7qzLGelyM4
-zSSsHcEnKqL3AHuF7OP1uBPrd2xbF52xodi4LktZE0gDEVznWsjepBWEI626JhYG
-Dqt4wFsRfPucV1iP4ROGD/wK7zmHhm3ThHdb8PqvNIL4CKQeKBBef77kuoGT5L4V
-5BLhihr7e/6rUFSDDwzP4+4Y2FdEeu/cKbZ6h7aLT87cgdNz1Y0L1M4h876E4PhL
-PkGlqQiaF2rGdRhliO41AgMBAAGjTzBNMCwGA1UdEQQlMCOCIWh0dHBzOi8vdnIt
-Z3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQU/TH99+zMyvk/5KWzb1vS
-0oJ+5L4wDQYJKoZIhvcNAQELBQADggGBAKEaUcToKkEfcgt+XASaOUKSxUI1xrEm
-xSpTNI1J6S5sdaGge5UWdBwAbLnyoScwXJpynX/4vQGCGnq9hxmcTzHyaKd8pbYR
-AoA97W8/RytVYpOgc+IabC4VzW1lXtkKR0tX9S2TuFuDaXl6rSyM4WV7DKRXXhXr
-0OLf0gaFXxaqK0UuF0y3Tc21KMGja1u6K1flpUaCxbaJR5rEUNhEHc+PU0ltqxks
-OlalzJLd2J5XT4JWfovkF7ZxHLEIHqSNzkSDizIWMucfweDgG6ZA6MMrUZZoAISN
-Y0bzDNFTbM5Ic4M9jBqXpMRtLv/4gzM8iFCF3XRpPJuOJIWZFKaJHop1D7OZC67I
-8cqdaNYI5WyhGCsvjDa32BWcyrkegDi79+Wt8qXaGCsItKnpIo9Aj/Sys3gCKDCZ
-XSVWRG272Kd+EAB3DXH4RBBSItGTWFiGro5Rj72UxQ+Me6zaVVfmbTljEQNqw7Bd
-k/NdOp8HphaQKtlQnK7oGfZdAZkhCMWQBg==
-</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://vr-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vr-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vr-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vr-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vr-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vr-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS VR Graylog</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS VR 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>Ernst Widerberg</md:GivenName>
-    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/vr-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/vr-nav.cnaas.sunet.se.xml
deleted file mode 100644
index c9d6e8b0..00000000
--- a/metadata/swamid-2.0/vr-nav.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,122 +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://vr-nav.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-04-11T16:19:27Z">
-      <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://vr-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vr-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS VR NAV</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS VR NAV</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på VR.</mdui:Description>
-        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at VR.</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://vr-nav.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://vr-nav.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUPJvDSw/6kkN19HuLaHc//PEwHRgwDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAxMdaHR0cHM6Ly92ci1uYXYuY25hYXMuc3VuZXQuc2UwHhcN
-MjIwNDExMDgzNjU3WhcNMzIwNDA4MDgzNjU3WjAoMSYwJAYDVQQDEx1odHRwczov
-L3ZyLW5hdi5jbmFhcy5zdW5ldC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
-AYoCggGBAMnGGaBocrpOyWQOU1s9uxGqmNR/nUMYg2RA6lRDeAa90NLO0ZZb7xaO
-VJ2Z/piyey8c0eg0x6ZbzscOXN9iLMLotcv3iAOfmJIb11+XaTOWT9QXlBpooLBL
-2SQuIHv0B+KcQDy8I+PbvKpXQhH4yV7eS61FX5+27M2oYcA7xurqxv1O6SOVSAxr
-TWGpZ6zCu4hETQKRNdn74VTODMxHj8JLGZdbuv8CpwVAqMwhn9DN18Wx5qqmocx2
-radjrkT4NppHgpaZbDgmmwEBSaSyZHU6fBT4CcP5av6LImPpzCeSqz+8zPdpUH0/
-tuYpxc446GCC6Y4veFcHsLiQDGXqryiSOzlxSJad07QcnifR1VnWrnR5XVvN7eir
-WTwxkyC5ZiBNMk+JORidcyWVlRcnpLtJ6PhXRWI6vGFnhAysHkcwBkPMC2iwv9Wy
-yWYlAlBvR/7mB+eCoY/u+TFfBkCkaOElILpTwswlfUyh7UUzkCBf/5yEyyksedSG
-/uyv4JW9tQIDAQABo0swSTAoBgNVHREEITAfgh1odHRwczovL3ZyLW5hdi5jbmFh
-cy5zdW5ldC5zZTAdBgNVHQ4EFgQUgC0pSR5awu3XBFEOjrn72b24wggwDQYJKoZI
-hvcNAQELBQADggGBAMM8/Winiri0dPikLF5i1BInCQ3L1HGpmQ/dHx+S/p4pvHDZ
-rxARCKgpR1+x8DTrRmkXfm0SAo+REc1Lh+0IDsR2V5rtmuTzFUrurV4E4hTlkBfH
-TmScQZ+9yxm2xnVmnrriVf75nhlbQ5JS5q0cPJJ0rsyAQ3fJRMrrOZMCGpsOaSeD
-8jE77dG63B7lXZ9fjs7IH5QwawJBJFvNvNyyj6aP0VRU4yf1QWDVJQvlEtAgph53
-OMZ99tu3W1DxMsBWnwROe2UieHc6LicOLeQmzHOTQDy9R9k1M2x5hLCB/12BJaqm
-81bnqv0gOuo0dkDSKyEk9HUNLdS0JdzTKzK6/saSZe5Fh1jvEDf5xVq9tF+nwJnO
-zWuhvm/aPGyyG7H97A0vDFvJmTrRx+H/D9hZdaDLZn8MbjfVvLVA3KCzft/bJKHn
-v6lGtuS06TpiAR+VqxrLpKOhx5zWHAqNFaEIWV3Ga2w7pCAr8i5WWystz1WibTLE
-bctpP7CAUeaP0UPPrg==
-</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://vr-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vr-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vr-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vr-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vr-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vr-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS VR NAV</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS VR 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">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>Ernst Widerberg</md:GivenName>
-    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/vr-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/vr-ni.cnaas.sunet.se.xml
deleted file mode 100644
index d688a3b7..00000000
--- a/metadata/swamid-2.0/vr-ni.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,122 +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://vr-ni.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-04-11T16:19:28Z">
-      <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://vr-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vr-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS VR NI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS VR NI</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på VR.</mdui:Description>
-        <mdui:Description xml:lang="en">Inventory system for CnaaS at VR.</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://vr-ni.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://vr-ni.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEJjCCAo6gAwIBAgIUYWAjSMMdXQ1j4oqlWf/OUQLzwKMwDQYJKoZIhvcNAQEL
-BQAwJzElMCMGA1UEAxMcaHR0cHM6Ly92ci1uaS5jbmFhcy5zdW5ldC5zZTAeFw0y
-MjA0MTEwODQ1MDJaFw0zMjA0MDgwODQ1MDJaMCcxJTAjBgNVBAMTHGh0dHBzOi8v
-dnItbmkuY25hYXMuc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-AoIBgQDRLeAbIF0T2MeSZ8+hR92K2C/EaLU3i7PCrtqiT0z4QKj0E1o07dIB0YU7
-duzVseuk81FpdbhT3gqooj4NA+qLK7HM5X5rzk4fNoXFrytubNA62yXeTGpd//8B
-bontiw/yfqH774CUMEbSxZeZ2dzgSo8ckERDiG2SG4F30v/jLMCqjDkQQDcF5Y2u
-x45kF16BG3uZQv3M010ZrHedf0AM1BTCGndWfajCoMq9ouPsVsG+P0KMiGdiTzj+
-GQMkJJqfYmlUGNrLEeRuuVIHcvG3diSdkD5j2l3uMHE1Cd+ckVgoKw7VW7CJVBEO
-HNyBGwA9RRcRRDrloi9qEs5hp2A/XDhPUeOdgmlwOzR3cKS0wpdvcdcyebeewKRm
-8iL+O8Caq4yqDdYNxjXTstE6uZ8V0YWLGHeDxKyBpB/wIlAji1EAngwkzDF/HO4R
-ZK/M7YeL72aWWsxTyEeUsP2+h7H+mf4ejQzfbvZycOKV6i/OiRaQYUHxEoL3ca3L
-9DZV6icCAwEAAaNKMEgwJwYDVR0RBCAwHoIcaHR0cHM6Ly92ci1uaS5jbmFhcy5z
-dW5ldC5zZTAdBgNVHQ4EFgQUI9v9bJZZ+puRHChav1gJNysYE8gwDQYJKoZIhvcN
-AQELBQADggGBAHaivtnDowTbTwpzEg1LjbLpLTaFOKg4pgH6zQUB42RLocL1smZW
-r3OW1cbBg6ilZicLtdTf+Ob9sxorrQjSDZwZwVpa+2lD8SKAF/geU1vNEmdwSKpf
-+ZTw/p1dL7dpagTaDvurnHmdXYJhJN7FMmVMnKHaMM5Nwx7JiBZIle8dXhVo6WP6
-zATE3n8tY9br+nnpVWuBr3BpQnzTzQfFBwKaYTLUzJNwm2o2DbKJEYXmEfPB67CW
-HjzPWh06MJp/NPClizEv9fwIGl2W52qT83sYVvHmb38DN8lfunfha9XxnUXGOx9o
-4SCE0Rcw1JxqNEmi8TiLHwgzjei/I9KeS0vZAcLcXVyhyUCXQ4uiqzpddBEcY88g
-aYy3zGthph1a6y4dCqMx6a5Jl8dt5K1nZ3TCzpE5VRHqf7xk2VwfIFTpkFsg723d
-ox4VOB6xX60h7X4G/Olwmcks4VB2oc7ocGRz9+0fy85gqRLKsRv8Jh4dAA5B7bT9
-evNq8iUcag9HrQ==
-</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://vr-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vr-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vr-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vr-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vr-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vr-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS VR NI</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS VR 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>Ernst Widerberg</md:GivenName>
-    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>