SWAMID-3451: Removed som Cnaas entititesmd-2023-11-15-v06

5 files changed, 0 insertions, 622 deletions

diff --git a/metadata/swamid-2.0/du-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/du-graylog.cnaas.sunet.se.xml
deleted file mode 100644
index f9706951..00000000
--- a/metadata/swamid-2.0/du-graylog.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,128 +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://du-graylog.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-11T13:41:45Z">
-      <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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://du-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">du-graylog.cnaas.sunet.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">du-graylog.cnaas.sunet.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">DU Graylog</mdui:Description>
-        <mdui:Description xml:lang="en">DU Graylog</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/SUNETCERT/Graylog</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:InformationURL xml:lang="en">https://wiki.sunet.se/display/SUNETCERT/Graylog</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://du-graylog.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://du-graylog.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKjCCAxKgAwIBAgIJAPEbwzgmXcMSMA0GCSqGSIb3DQEBCwUAMCwxKjAoBgNV
-BAMTIWh0dHBzOi8vZHUtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAeFw0yMjEwMTEx
-MDQ5MTdaFw0zMjEwMDgxMDQ5MTdaMCwxKjAoBgNVBAMTIWh0dHBzOi8vZHUtZ3Jh
-eWxvZy5jbmFhcy5zdW5ldC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBAL5C30+KQ5K2tyL9Ps81Rn8HgKcsthdoq43hIo+LqhjZxY0UNDPfhlrlqbFb
-9I9QDVAYm8J8EQkIwI8XPL38QKCGli6Yvr/WJe4dx6EocIxp9ojYy9acpPmUJzqN
-TOvDF/R1JIjT8bWIJpBwWD5lUd8n4k0WnxsDe4GJj1tdaDIaxprcyT9beco4Ducv
-o/AjHhxOch4go9iI2YiKqmRriROEEAC8pdKU3yvoQcV14lIvpB9r6CGgefGy4FIX
-tIQCoqn/716FeUNEs6jYkCB1/fG8L5gRn9YsaVgB4rZYYhwh5FRO1OuwvmwN/2RJ
-xBrqheVp5THOvkhEi7g+gq5KM+55nvcijmGA+Cr6nZdN7Xd1VvNP6r9Jyzo3iQAb
-OGX4Px2cMsSdFl+/4Krl03zD/m5NxFP8cHi1yJ0zxH383UgVoV+wRGka8zD00AVn
-uq5NmE4XTcup2Sz8UeSgMINs0DFGPfZM27zTon5wPDxlyhRGmcRI5PR0Dkxlo5V1
-GEWyY4Z5tYxSDOZHTqU0xxM1sHz13Jdvs3cRBMtCvex3pMLSA2iSkNrW2vz6iofD
-iXayRBWdthxJEY1lJdlimtZbKTqG7J9+SU/+Kih3+57jcYLCGiXv3pwYCkLzGkQF
-nPpTNlOEg6SAkjZXG8zvDficBaocxKRyo7LC6I+GbhPC1tMJAgMBAAGjTzBNMCwG
-A1UdEQQlMCOCIWh0dHBzOi8vZHUtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNV
-HQ4EFgQUKG0BB7KTLfhMi9ixEYvwbelQHtIwDQYJKoZIhvcNAQELBQADggIBAHaD
-5+QHkg44AvzhuwMEAD85i0Q4OY5F/oTZ9zuaqpYf3zrjO+Z/HXbMna7aH5Da2OWT
-Nr44ofm1Tr/1dX8FKHEX/1MK6TUoinianC0uEHxyC7ykR4J/HYF+JrfHid0KNeqR
-bZ+beWEa+nVoI7XEnFSsOuqbMDn9jLjbfCdJ4rwdCgezemB2se+Rx+lt62mih1lE
-dv6oxcAj2y0IpF/k274TRVdyAeGnviQ+xWbn9X5Zsb3Lyt4qDeZ8pTsgrAXHnoEv
-AZGI9pIbdyQ858rnxxrNzXsewiribPIhrvqEIhR7dXxYnZM4EMbf3qyaRfgHTACe
-9c+7e6NddEeVEnSSCb9Vpu2aM+MS7guFUyq12EHmGLowePWtSUY+00YhU8JG0yJX
-OQw/AJ+to1dCM5bJIXm9Yj7tHh21sexjvRrOmQFv64OYCnXNF1vu4ut3Et1tcalZ
-EARd5NC/I8nF6fTeGq2GFsixGOZJRmvE8Mre7PlIq7d9WOmSkr65OvSBC88TwfBD
-4wwm0haEFVJuftAs4p9Qq2J/SbKu0LiO1r5u2OwQ27FccQxaELLG7zDDLZnV2SKu
-igl/UXk2BlGfKiasI50oWAz5x8oA5EFE0usWGHph717vxUERSVv0L2qKKLhuFDKK
-48dGtYp7qB8kYZ0mSVyHuKaJ+Fe/Mcbqe9PAJ3ts
-</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://du-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://du-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">du-graylog.cnaas.sunet.se</md:ServiceName>
-      <md:ServiceName xml:lang="en">du-graylog.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">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/du-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/du-ni.cnaas.sunet.se.xml
deleted file mode 100644
index 66a3bf21..00000000
--- a/metadata/swamid-2.0/du-ni.cnaas.sunet.se.xml
+++ /dev/null
@@ -1,128 +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://du-ni.cnaas.sunet.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-10-03T08:47:36Z">
-      <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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://du-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://du-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS DU NI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS DU NI</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på DU</mdui:Description>
-        <mdui:Description xml:lang="en">Inventory system for CnaaS at DU</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://du-ni.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://du-ni.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJjCCAw6gAwIBAgIUZ9WrBvxxfOQknnT/54nWxbKAIyYwDQYJKoZIhvcNAQEL
-BQAwJzElMCMGA1UEAxMcaHR0cHM6Ly9kdS1uaS5jbmFhcy5zdW5ldC5zZTAeFw0y
-MjEwMDIxNDE3MTRaFw0zMjA5MjkxNDE3MTRaMCcxJTAjBgNVBAMTHGh0dHBzOi8v
-ZHUtbmkuY25hYXMuc3VuZXQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQDXc+rBGYxWwika7i4pNpWWKzxbWWrcrg7Orrdr3rE/8XKnJMdGlhT2B37t
-vK4AbmH/Ej2CeaoRc3lzYqQO4oNTOeo6hnCL5XKfp44WI2icePJB7v+6thkT3kDq
-sYQZWFKOJxUejE1d74xboo8KzNGKketZsuk+B/+i/fWW1e1xFIeEx1lz0Lm8pVVV
-MlhpPnQliP3bOAAL4RU3rfUw8bCaZAy4QuN5Zd0S8PN5K5NfFfWmQzfyBYNbErrw
-JWEqETEmLkalnlCluYCBlcTA8XU5YOtgh2PCiPZZeVzuzdFbr7DQ+EBhG/J4pM38
-FtxpEBgXT4GAokfRP8LPLoYSQMrmcqHwShaIvP34AojjRLCVCbf90DoO6NpN4HqP
-yK/Ud3xoZERwlenpApo5e7XBl1ol8FOVH7GOgegg5af0cAB4ysnMfpTNRM1mlFng
-vBiuaTKkvesjNh47MUac8vMATHzEwtC1M1yE0DBKHIBncUesOwmQfnZGG4c+sEfO
-L+ZEtGxllFOfzGGf3XZVQfjziXBVb8chS9bD1EwluxVXgdzuqI2C+n20QwBfMmW+
-0G35pQ/URRF6ilcEn5IwXt9Wpraawg3thOgV8p1xMOuVQ+P0WTsABdvT9OZA2BAm
-qSesGPu/D4wXdqwdDfby2TUOg2avBCSQPl+0hLarnY/jBn5LyQIDAQABo0owSDAn
-BgNVHREEIDAeghxodHRwczovL2R1LW5pLmNuYWFzLnN1bmV0LnNlMB0GA1UdDgQW
-BBStAlsX6nAjX62sftI1BoJsk/YYiDANBgkqhkiG9w0BAQsFAAOCAgEAvoR4x3oJ
-y+Vko+by/OWbqj1y1iyxldQOpgd/WDqOyqVq177ngBhuIwiEVq0YZA/MTwesHQ08
-L10RsT7QKNNp445WbKvxf2CuLG1FSXYzqQ+gvsaWbROSU4t0EjXFv7u6TZ/jiaP2
-tumip5Y+AG4jekDnhO2Fj4Ggwo/b240OkiyG0A8kRhORRySJZcKEeDxhthLcaVw3
-Qull6+G1k2F2hhZnT7OWwqIoy4DKuNd3MPZTJawBDHjEEeUOXdivQJ82zi7lHghy
-QmbAR6N+jsjw4qkhp6RCU7C+Xy82Bf3Ouv84r5eai47DmC+p/u7WC3MJc35F6666
-Mv6aQOdA83MLhTSxNjvjnKy6vByj74Qnu6IyMiwSpn24uyiwdHfavGBjGX7u+rcR
-rvmTB0vyAd2n6EDeptlsb2ywlqzdQT0WxQefKr/mVoQojm13AL1WcfyMkUeqYmm0
-OTfTqoNk+/OfT3Dy7Jtp268XVA7c2S8suUnR/SFqXMdeaggjv0bhWcFlJ4lJvFL0
-kyLSbOVTsMzx0hpOxoCxo32Mxu+uKLwXexEq+Inp9vGwNCBM3orb/z8YFL4ySTru
-ZKkmdD8wZhdOQtry12nNspj/aGWn2rj5K0W59ZsXnVMUJHIK4Xj+41Gz0OPIzAXz
-zXCjksy62QxpfBt+NQKcJaMFyuW7xR1mJRQ=
-</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://du-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://du-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://du-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://du-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://du-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Inventariesystem för CnaaS på DU</md:ServiceName>
-      <md:ServiceName xml:lang="en">Inventory system for CnaaS at DU</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>Paulo Pamplona</md:GivenName>
-    <md:EmailAddress>mailto:paulo@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/su-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/su-graylog.cnaas.sunet.se.xml
deleted file mode 100644
index 58f2e529..00000000
--- a/metadata/swamid-2.0/su-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://su-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-10-15T08:12:42Z">
-      <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://su-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS SU Graylog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS SU Graylog</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på SU.</mdui:Description>
-        <mdui:Description xml:lang="en">Logging system for CnaaS at SU.</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://su-graylog.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://su-graylog.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIENTCCAp2gAwIBAgIUFX8yrSrxPgBaf13wiStKQ5cwyRwwDQYJKoZIhvcNAQEL
-BQAwLDEqMCgGA1UEAxMhaHR0cHM6Ly9zdS1ncmF5bG9nLmNuYWFzLnN1bmV0LnNl
-MB4XDTIxMTAxMjA4NTIxM1oXDTMxMTAxMDA4NTIxM1owLDEqMCgGA1UEAxMhaHR0
-cHM6Ly9zdS1ncmF5bG9nLmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEF
-AAOCAY8AMIIBigKCAYEAuOwo//TbqD4oFYguV0HimTiLHFDIBe20yQvrm6l9QrYe
-Xjr8bpb4aSfThYRYkER9KPoSBBjjKw5Ez/Ouf+RkHVPedkgsDcbsCZNAGh6shBuZ
-4waiVKsnMvAN15zW+3yKNSFFapUGTNXtoTp4h0yjgxHerEbvcaTfgqdwn5tq7CRS
-7M1NRgzDvAInXr9fbeoVuv8pEjr21u4LMrdB/DGQdUdnHqjc+as5jXI9vRm4K5vE
-1xFUhoG9WdvGn2aumjyfLKZ0BhvJWcU2arOPQlRS54hgVhEMCtv8Qlc0zDf+yOod
-GoceXUPHJKDQoAlqmB2cA+V2CG0vi0B/J1ickbUAJT/LK6PDa4Qr1MEXsF99dy5h
-00+0kywU6bubM49YpGLU7QxdG/mc4zIQKqHO/MO3m3SlTAkk1hzmmEXUdAEd8IJS
-eDsrRNy6dpyemk3sE6cPt3HiyMYjg4B5Q5ZASQxUY/QGaiT2Si1L2lLNOqq2bJYt
-ab8h2G3EUZ091qFb6hMzAgMBAAGjTzBNMCwGA1UdEQQlMCOCIWh0dHBzOi8vc3Ut
-Z3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUxvYdjwEqSuFc622HGyic
-HLKCcrQwDQYJKoZIhvcNAQELBQADggGBAFDfxunfVws8tlI2TF1ymYmcumTrZw11
-9nvTodFiP48x9gZTl/01+mLF9apnziQ0m7mwDwC2dQOm+NxiCz/heSHDt1cNS0vk
-XDOIN+VYrmiu3GJFyufSMAcc4/ubSZNev0VHyKPcty8uAmPvj45TYg6HKwzDcVC+
-5cI5unC2f9RFnIaZqwfBA9Mxiy1Xn+Yg+wv1EuH5CbM37HBgRJih1Fczp57s4+vy
-M+mnHMCLHu7kIVOL1yPmnMLOB8zHs7hlS9fO0r7p5E/qKn7z1nuoFgEmKcCHNsSn
-Qxfghjw3R1BWmkcS/toaYrwSGUa/+X4KR5iFYaGwLeKXx3B+yEzIOTQusDMM3nyv
-uOIdJVlIm7QV39tJFagqBmUJqvSSSTWNH2duTkns1EMqU8nvG+S6+RGillNgMi43
-NFhFdmg6J2IG1SXfgBoqBhW/Bq2j715ie3RlsUyxFEIpFvQ06QJ1qBmCMZsPdg5K
-2mwZRLBhG7Gci2XjTqd4fyuoWM3/5VpM3A==
-</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://su-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS SU Graylog</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS SU 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/su-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/su-nav.cnaas.sunet.se.xml
deleted file mode 100644
index ad64309b..00000000
--- a/metadata/swamid-2.0/su-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://su-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://su-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS SU NAV</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS SU NAV</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på SU.</mdui:Description>
-        <mdui:Description xml:lang="en">Network monitoring system for CnaaS at SU.</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://su-nav.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://su-nav.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUfBfiXvFlsYv55XGDJKhg9wehGigwDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAxMdaHR0cHM6Ly9zdS1uYXYuY25hYXMuc3VuZXQuc2UwHhcN
-MjExMDI2MTEyNTIwWhcNMzExMDI0MTEyNTIwWjAoMSYwJAYDVQQDEx1odHRwczov
-L3N1LW5hdi5jbmFhcy5zdW5ldC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC
-AYoCggGBAOzBRkv0cPVt4x+meNZgzTXbAckq2u/1yu7z89QlGCBTxAqU8hDaBvW9
-T3gZY/SpasNTqIcj7tQ5Hx30HGQtno0xbtZjrVJFHi7r9BszyEm9cbXYW/2vnKGD
-BbcmZa8N2moSkhBh8L9ba6ubsflIKYdiRJXppmckJb08uaqembNJiw8rEvXLQaOj
-7nnYtJPAH7kvoRR0QFV1wAAGrToPtBULgLtIw5nkDOrK2Wp2mONpvX/4fXzFNktS
-OrHalc1HQ3l3fpI05fm1w+mWggi0GC+7IKs1hPKdqFSPJAG2g8f98EL0T9PZW4yd
-kwKo2DHCD84p9BkAFN9jxx9jzkjSDrSIFXRa7wcvksz9u/vSWOCVlYTQTbb0hce2
-WW/cSZ0FTYpCh4KLHWb3UuqeBNZ8DQrJkgdjgV82lvG8aXGWzGELMrpwg52T/EUJ
-MgWO0As/tI6f62r4X0Vro10CxmrNJfBevL4u7kbNGJgbgEhNUMaQtt0ASQAGY2TB
-OgvzPmgP/wIDAQABo0swSTAoBgNVHREEITAfgh1odHRwczovL3N1LW5hdi5jbmFh
-cy5zdW5ldC5zZTAdBgNVHQ4EFgQUKgrsX8Q9cU8YDfKyu5GCxHgKr44wDQYJKoZI
-hvcNAQELBQADggGBAM4z2utUGKrc2ps9eAxCIvybncheCXIvqdkYIFGBwKLxyniK
-HTwPCyzUdLycEWxLFqHrs5XRXJ4+ATOILi6Ad5TvOcZxujg0N/jq6IzdxBCNiZxb
-FS3a4MSt1kISOiBuYcAyS6f95WsWnjhhv6HgCgqIqVGohEQOweF7gAqwrpAjkqRE
-Y3tLpg9K6RfOrz12SiQa6I3NyBbmkO0jVkN3YLPvdLJdf8/j/chgODFZPlsqLhlr
-qLVv7eSLgM02TCnVEV1oMEgOvZLNREpfwgL1sXcYN2t+j1Dv/SNhpAg7IhQ+sDfA
-4AGbAfMQFfz3tXRGbJMETi7w7DqejwvHGkB7rDXZWa0VfItNxrz81lJ7l2PYuJsa
-AIiv6edbrDSfBhRmIzhBbf9wy8NPNYmoiFmZu4RENvYNQfyN9P6Q6sjtm+QAWq0i
-P0Cs/+p7gXBp5xsB0glXpKgWgRoyYoumeV96RJeR4tciXRj5KKNaLhyPfaT2RKmX
-lh3MzdEGeM5NWMmMSQ==
-</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://su-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS SU NAV</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS SU 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/su-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/su-ni.cnaas.sunet.se.xml
deleted file mode 100644
index 766fb21a..00000000
--- a/metadata/swamid-2.0/su-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://su-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://su-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://su-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">CnaaS SU NI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CnaaS SU NI</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på SU.</mdui:Description>
-        <mdui:Description xml:lang="en">Inventory system for CnaaS at SU.</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://su-ni.cnaas.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=https://su-ni.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEJjCCAo6gAwIBAgIUQ26g66/p8SbJeizIprvwI8ky/7QwDQYJKoZIhvcNAQEL
-BQAwJzElMCMGA1UEAxMcaHR0cHM6Ly9zdS1uaS5jbmFhcy5zdW5ldC5zZTAeFw0y
-MTEyMTUwODU5NDJaFw0zMTEyMTMwODU5NDJaMCcxJTAjBgNVBAMTHGh0dHBzOi8v
-c3UtbmkuY25hYXMuc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
-AoIBgQDSG7oEWe2H7GX+1W/4aEFhL+SGtjqvNidHozH8vR0Bbo7RYVKElYs2B+FQ
-8ih/ihCFuZAlNmzM3kMT7tiMxPsVW7ofhPgS56yLMsoHrS7WodCta8/ng/z+ZUQj
-VW/GEm2qahqCHtfnU4s+psexo9cgxdXUUBzxpB0wQFlHMDJf2plbvquHjs4Oodq4
-johJaH4UA68KqgvZ4bBOEUhj22wmBYrPf2ReZJjxwyDHSP1G7DyOxoauEOV5Apv0
-vcNA7T75u+Mr9m41Yt3MjCZRPdrekWRqMzlxUXodZlhXzVko0VYtFgqV/fT+4T0W
-ZdOsY6lCGFoUa4vxsWkpRjWjnkGFmxM4wq0ucjed01OawR9HgFexaSgfL2r/03R1
-wWQkESUQ/96yhn3ueLPDi+wPce7++EKZwFzUVGj4FPQq+G5wKBMymXIj/k5VR15i
-pE2qK5fwlnMhGFiq9q5rTBXRtVa93xfJ1wFhGF+IQ7x063BlXy2RjJE0FTf/D8ni
-/Jq76FECAwEAAaNKMEgwJwYDVR0RBCAwHoIcaHR0cHM6Ly9zdS1uaS5jbmFhcy5z
-dW5ldC5zZTAdBgNVHQ4EFgQUIX4BCuQxjRvVQMEDD/KiJqMz/BMwDQYJKoZIhvcN
-AQELBQADggGBAF3Avp4tM5Yb8NgIW/viNTkHW64kmYJDLf4frJk9Sys63S+pZPq0
-fWXOE4zLwBtBxrSFoTPDWc0rrhSjBe9p30FvtSPQ8fvKzvdnASTWWRr5xDitNREL
-FYbGA9gOKWj5i1Kn2N1NHSGxFly6uLL6tenm5JLtQzEu+yaM66NTcTdKHtY0BOLw
-snUUXvoNZmTIna6TuPm/UHNCenIQIbfR9xmH2sfMLwFYF0rXYxzMbJ5J8700h1TZ
-N/CtsCaflW9ZSS+wWEBSMCjOHgaOLizPs5JIPFaUJcZi25uTS597Y9HBn7TgcZbC
-/qua207vc47JRBwy8pRT2c0odjXZOHG2mdhlpB3Z09keTvF7PtoGQvXtF8Sh8+t0
-deJtq65msFY0gWbvk8vRt5N8RPDu1qfM8xRcX/wdC+pLJ1bAyZwz+iKDUiLiTM/0
-t/MHG7X2QW9kvmO+IaK52SWkkbLK+a554hifBtQq39DmTXctv65uCSPzE2EfRYU3
-/QWzFvXkB8TcvA==
-</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://su-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">CnaaS SU NI</md:ServiceName>
-      <md:ServiceName xml:lang="en">CnaaS SU 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>