Merge branch 'master' of git.swamid.se:swamid-metadatamd-2023-03-30-v01

4 files changed, 80 insertions, 157 deletions

diff --git a/metadata/swamid-2.0/disposer.c3se.chalmers.se.xml b/metadata/swamid-2.0/disposer.c3se.chalmers.se.xml
index 78c82b8f..08c7809b 100644
--- a/metadata/swamid-2.0/disposer.c3se.chalmers.se.xml
+++ b/metadata/swamid-2.0/disposer.c3se.chalmers.se.xml
@@ -28,44 +28,81 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">SUPR testserver Disposer</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SUPR test server Disposer</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testserver (Disposer) för SNIC User and Project Repository (SUPR).</mdui:Description>
-        <mdui:Description xml:lang="en">Test server (Disposer) for the SNIC User and Project Repository (SUPR).</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.snic.se/about/governance/policies/gdpr/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.snic.se/about/governance/policies/gdpr/</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">Testserver (Disposer) för Swedish User and Project Repository (SUPR)</mdui:Description>
+        <mdui:Description xml:lang="en">Test server (Disposer) for the Swedish User and Project Repository (SUPR)</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://supr.naiss.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://supr.naiss.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.naiss.se/policies/personal-data/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.naiss.se/policies/personal-data/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
-        <ds:KeyName>disposer</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=disposer</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJAJpQNd54W1WpMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMTCGRpc3Bvc2VyMB4XDTE0MTExMzA5NTI0MVoXDTI0MTExMDA5NTI0MVowEzER
-MA8GA1UEAxMIZGlzcG9zZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC+y5uIuslZ8w+FzuKwwmmkbpGkQVeryBrlb01ZhxRLlI/uB/H5/SYuSkWOIwmh
-bXBmd1wE8qlgx50PC+XZOdDNMY1vV/gva6MUQagU9rztDcpAQcm/sIoO+ocvdLiC
-5x/JfAPSwbA/5OyCRYIYR+LjFgZNC0q3sMtxAtsdQjP7dOK0D8JRRNGpCTJHgCPa
-dLjhau0NRmvUhEfaHS05zbKETZUte3ZTmPxKrrc8GwOEMyGu4TWOQyRT02SHEOjL
-gSMrek+gsjXxKz6jrxUVW1spz+F2eArUXrStQlvJT9gOjmFEep0jGCoXcq10QG+h
-+WvvuamBes8B8QpsdIkYXOLHAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGRpc3Bvc2Vy
-MB0GA1UdDgQWBBSzVONP+mikveeZyi4aTBJzi6aqFDANBgkqhkiG9w0BAQUFAAOC
-AQEAHsiX3kB2IDsp15WOq7nWLPhLOJvTMQoKi3mEJ5gKkCzuUHHoulw8HoJFKKYJ
-Cq5sf8d5WG6AJCLuofs87/qtu9AdLjWuQXfhIgdTKrW951sXTIg605dmucR1N//Z
-9WESsxzk9PVQwbEU6SKhLJKRXx4/EmfPHKYTnWEwWr3mzr93a0Xk9Hr7UJsViK1q
-JiXD3ClfD1XQBL7fH9QglS8Wmxkj4KhLZY6ski0dOGF6LeZY/FDMrXiExOgLK9uH
-H9JEriBZP+KVDFZ1U6rKdISQcDUMZLSZmEiVLmqBeWY6XNYGy6SbLM23iyjIe2FH
-o/agI+HB5oEGJQGKjPQGnNTpng==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFNTCCAx2gAwIBAgIJAOEeqDtx48XEMA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWRpc3Bvc2VyLmMzc2UuY2hhbG1lcnMuc2UwHhcNMjMwMzI3MTQ1MzA3WhcN
+MzMwMzI0MTQ1MzA3WjAkMSIwIAYDVQQDExlkaXNwb3Nlci5jM3NlLmNoYWxtZXJz
+LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzZWFmJvn8tMLWVHN
+egIGaUU4m6AGtknnWjHPQRHnbPJ69PgZnD5cQ/G88MWRZIPpQv7jq0LuV4tPZ7Ng
+tpEiYQbhNXY7yJCldAWfw4v2EyqqVNkp5hGnjS//4cR9H7tcZwUOBXNDCtS7fG9K
+zqnoy27bWekh1S8QHKGW2gBUZgvgRd4RrDSzT8DlZsmml2BVGohM5n2EqKROsWF2
+XoaB+vDPlf21A7/oRsxkMoYLy9YUQQ4PmnjN6SZA9NlkBuYz2NR5Zu1KZVOPHmUE
+QzWsAT64zxetzTtQHdVr2/QwEEp324oFvRsrNzrhQFTfLAXb1mgyfXRVcNJqiF3r
+R9fHWCOoOSl+/VnL7067jTAdQ7sYt7r0yiLC7DeESe1bj1vARhuwfU5/pIXqvnpN
+ftj50dSiVqUBsuKmJSzzzIR/jrkJw7QI01L5OujBmdfe1aAzdqRJdVKtJ964gV5W
+U4P/8O1DbQoXC5KUGB7quuPbNxWsYjGeZ3Ev3QK6PcRKb/cf+h43cTBGua5MWsYj
+ptbQEgHeFh/1gkqBQgitM7H9UUFUS2eoCA6o6jl+zhqSF1qjkD/Xy7xSsJlQpDmg
+CFdIQu+PIPpEx2x+vcQ4O4NmrUVJ6jvCbNTb0R1Wqb/bpTUHJk+AKlAD5sfToVTu
+UeM2VeYPL0xan71XQxcvJB95GxECAwEAAaNqMGgwRwYDVR0RBEAwPoIZZGlzcG9z
+ZXIuYzNzZS5jaGFsbWVycy5zZYYhaHR0cHM6Ly9kaXNwb3Nlci5jM3NlLmNoYWxt
+ZXJzLnNlMB0GA1UdDgQWBBRzTKD9g3zBgr18UZh4no26WtSc6zANBgkqhkiG9w0B
+AQsFAAOCAgEAS6aoiY31mgHEaZx5Fhi5tXzvKfIZFQGBo4BT/QXicVtBlRysJyww
+iQ5BQHgfBWNRNMEhbH5+NnnRdackvfDi+GAHx08CyZSkADgG5qNfiNwsHUix4ljO
+4yI0S7KUPIlZr4BBd97VkzddVmnwV13B4nLMOgJptAXF5m6FU6dM13TxrHMg2PKh
+kpTK1en7YeGpZwCZtkRhLMqzV+mq1AaS0lDhk4PXyuS629dkV5kVz9P40KLXj/cG
+jhul4Oe595xgAoPicH3UpV1b76rRYzEo20nVNzEzxmlaIfHJuCrk1XuK/p7N1NEr
+p8IHox8cqrhn6iYgMk+Zoip6z0fWfJekm8O1/8zkseajGFCmntFMo8jVpy04awbD
+HOPx5mmYqANPIuw9x4XOtIFgsQHSowZDLq+M+vtTDrCsnxKcP1l03sgUgUXlDgRp
+ZaNeoVC1r4z9KBlQCKNepGEGMPHNsHZKbbv+L5u5fCFb0/C9sIB3WYUy8iUpP+Ok
+y3JUpWkBYtG3zukp0hTugh5rwfRSYpADQOBZ7RlVQloyZQ9o/macZ8MVOxMMChhR
+LpuIp2Zzyw/rMX9INuZkMjzF1y0OOwEZ9XaEATBs7x9qL9pLSa5LA4E81Dvvu8ny
+JVHpV6euNGVrvVHe5L5+mCoP9Ck7IhO/UyUfHPdtUmPrIVkQ9VaxrxI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFNTCCAx2gAwIBAgIJANfYmOe6JoU1MA0GCSqGSIb3DQEBCwUAMCQxIjAgBgNV
+BAMTGWRpc3Bvc2VyLmMzc2UuY2hhbG1lcnMuc2UwHhcNMjMwMzI3MTQ1MzA3WhcN
+MzMwMzI0MTQ1MzA3WjAkMSIwIAYDVQQDExlkaXNwb3Nlci5jM3NlLmNoYWxtZXJz
+LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwimK2YuUJJ4jrRsy
+TAj0u2W5UFzoPhCjItGMevI3+uYQkM08VY0TVq0ELe0JTMQ4u+9V4vL+25XuD+KM
+NN28kjmVw/2KvHbVRhSxCdubFXU7wZjKEJAZ43tKv9bn5Z+JUaQ5zarRJqC892F5
+/GrbWO8zInDQvwWOyogWyByIqj50byeClTeyIqlsemzWl+N+xOS3FxVXMRhaBREB
+PJQhJb+SLq3HWv0v6TOx+aJ4bzyK0C1ywlV2sLoa3dQkkZn1bH7Auc6OXCA9iMih
+jeFpGIXeLbMA2ADuHFZ5Ca18J+M6WfnxMqFzIuBzG9lx0HWeCm0pCtWPWn6PWsSd
+Ydqu8pEblxankhIMsTCp6F4T7eXcWXM+aDh4QXOF00Ex4TR6M1u5Pk4gZk7n31JS
+2/LJKGltLLBBHchsl704+teOhfkddcJxhtGmI2AH3eWhL9l1DgnbIJTuSDJT5d84
+5VzstWg4nijmIlHYCmqTIimmY4JjGwPABAEANFO1+1a1LbPq2hLVJKTAPnZ7ZZ1g
+GWSQhaheBBXZ/x/1o66bkVmyTbS/appAqLlsgGHPmssoMPr6vwunt7o/+Kos38Eu
+NP7pR9pmRNXI4O7pQyoRUhtjI+ne2TWV6mr7VrqaEFJc+R55y7vCrbZ6DMNslhoP
+cga+C0BHWHR2j9U8daorGYhWNQMCAwEAAaNqMGgwRwYDVR0RBEAwPoIZZGlzcG9z
+ZXIuYzNzZS5jaGFsbWVycy5zZYYhaHR0cHM6Ly9kaXNwb3Nlci5jM3NlLmNoYWxt
+ZXJzLnNlMB0GA1UdDgQWBBS1/VbNTqyfSp3HFKcCn2HEcn363TANBgkqhkiG9w0B
+AQsFAAOCAgEAVY4RFL+nyWWxw1y0xLH5xELnjvA0ETZbQ94W04cBlaWBr9tlY+U/
+qdCfd/cXsvaqdOt6UfBjDelONmnTHanf/9nMPup8Ks2DYWvAuakgd/CAyoSdZKk6
+FbBbcDBySyvQ2riFosrqwB04TWvt0iHQtcICo9oKPMq0wUm3C8xJBqbyweSIE7MW
+KbjLgUwNbtdoc9VwuewbZaICeTQbQFF2YZGXz0RfupR5x3mIvXzHhGioXddRxwzf
+P6vahmXWuCNUxfERQ3XGTKzByp5WqiFO0KjRunSBTVCw6BkxUCZxW7A/oKv3gxMX
+bxWqBZyjZ2rhRPTRnHUz4F6dwClSS0KuwB+6jXPgmy5FLRhjxDes5A+YfUc0ydn2
+tZwXiqrxE7SKPKIqBZvwYwftV9bWCJy9G+/Ytq1VcemNZMb5RGAdlLVg//ln4WLW
+9WnQ6AWeqTnGWX974cGihzBD1VSAb609BQTeMPlf7EfHfhOe98DKBsgOaDjQVME2
+P5gKLykR8eHo7rW57yRY+eDAmgzw6JGWo1s3RBZ1F63LFC7ZOx54CsHslLZsmHZm
+ABfwg7hpZHD37GWgXeUmyiyAW0YuwSZntcKZk7PDj9tHWRDgg5kQblpL4mY0qpTz
+Ta5dQURdQwwDWIL9hQmLLxp1gy/7ewSvsfgPxfgmy7yqp7ow8z/9ITg=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <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://disposer.c3se.chalmers.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
@@ -83,27 +120,27 @@ o/agI+HB5oEGJQGKjPQGnNTpng==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Linköping University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National Academic Infrastructure for Supercomputing in Sweden (NAISS)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Nationell akademisk infrastruktur för superdatorer i Sverige (NAISS)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://naiss.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://naiss.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>Support SUPR</md:SurName>
-    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@supr.naiss.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Support SUPR</md:SurName>
-    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@supr.naiss.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:SurName>Support SUPR</md:SurName>
-    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+    <md:EmailAddress>mailto:support@supr.naiss.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Security Contact</md:GivenName>
-    <md:EmailAddress>mailto:security@supr.snic.se</md:EmailAddress>
+    <md:EmailAddress>mailto:security@supr.naiss.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/supr.snic.se.xml b/metadata/swamid-2.0/supr.snic.se.xml
deleted file mode 100644
index e6efdf2b..00000000
--- a/metadata/swamid-2.0/supr.snic.se.xml
+++ /dev/null
@@ -1,113 +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://supr.snic.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-11-14T10:14:25Z">
-      <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#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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://supr.snic.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://supr.snic.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUPR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUPR</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SNIC User and Project Repository (SUPR)</mdui:Description>
-        <mdui:Description xml:lang="en">SNIC User and Project Repository (SUPR)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.snic.se/about/governance/policies/gdpr/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.snic.se/about/governance/policies/gdpr/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>messer.c3se.chalmers.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=messer.c3se.chalmers.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAJ5kq+e+PrCNMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF21lc3Nlci5jM3NlLmNoYWxtZXJzLnNlMB4XDTE0MTExMzEwMTQwNVoXDTI0
-MTExMDEwMTQwNVowIjEgMB4GA1UEAxMXbWVzc2VyLmMzc2UuY2hhbG1lcnMuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCerDdofc8oW+/HTymS5b3e
-mP6PtgKgqOIfFFAZEgyevWuK5tgKattfc/3SFZgkV6Mtd1itIQHZ4+apbtH9fV2u
-ocapBjN46GHx5hf5Dy9vq+UcUtpbtAWM6mHL6q5y5lAb2DlmVbnRaVZuwIDiP1y8
-LHaIV5ZBI689px+Ch/BqMONfBFh+qZqTeaZm2MvP5/ndIqz8Ylzu9ew4f+9xRntN
-GFRRygaSH4CaP8ymhgd4P0ldY7DWYvU12GRZMisREH97NxfDhRGpZhcOjQANZDxX
-hTZuSNw4jSe6lUFJ059vb2T3ea2BkWtgEBwXCwT6HUrO+KbIzGNfA4IMtTKvqi7J
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF21lc3Nlci5jM3NlLmNoYWxtZXJzLnNlMB0G
-A1UdDgQWBBRiuvyLJNhRdxc009bfL6t4d1M6hDANBgkqhkiG9w0BAQUFAAOCAQEA
-FnyDmtBQhFIuOms1F8JslP3HaKtzAdQ5jjhzMH/W0UZIsnKaT+dU1+qOKbjS5GiY
-sdBZDa4dAqweL85Ycl+TF/03rYz0qC+YOq9YDd2QNAM7IdOiBGxCX5zaoha5elgR
-YY/jrujN0MpCgdXdZTbRxbKakQ5CUxBGaSoLE5Z46sAeqXlZrh+zxLtzADdMV2tc
-MoJW1wvwyQA08K1nGonNmkFGrFEiqQ6+JuM0KPnR3Rq/Z4BOl4VoTAYaRT6EyPEx
-pGuv7RK02oChLjhdGhzSuVXSbt1DthnmATOjO4kWAS3aPmOZC3jQunXmWb0NjO/l
-m9Ea0VNPPWBYZkyQ68fOqw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <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://supr.snic.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://supr.snic.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://supr.snic.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.snic.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.snic.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://supr.snic.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://supr.snic.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.snic.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.snic.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.naiss.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.naiss.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://supr.naiss.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.snic.se/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.snic.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://supr.snic.se/Shibboleth.sso/SAML2/ECP" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://supr.snic.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://supr.snic.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support SUPR</md:SurName>
-    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Support SUPR</md:SurName>
-    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Support SUPR</md:SurName>
-    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Contact</md:GivenName>
-    <md:EmailAddress>mailto:security@supr.snic.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/swamid.bilpoolen.nu-shibboleth.xml b/metadata/swamid-2.0/swamid.bilpoolen.nu-shibboleth.xml
index 68f27e71..9029ef3e 100644
--- a/metadata/swamid-2.0/swamid.bilpoolen.nu-shibboleth.xml
+++ b/metadata/swamid-2.0/swamid.bilpoolen.nu-shibboleth.xml
@@ -125,7 +125,7 @@ SUyStAMnUkEFZ+aP1IpgyG+ZLkuKJbpIWT7aSGkkQio=</ds:X509Certificate>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.bilpoolen.nu/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.bilpoolen.nu/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swamid.bilpoolen.nu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bokatest.bilpoolen.nu/Accounts/Authentication/SamlAssertionConsumer" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.bilpoolen.nu/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Bilpoolen mellanslag AB</md:OrganizationName>
diff --git a/metadata/swamid-sp-2.0.mxml b/metadata/swamid-sp-2.0.mxml
index 8cee27da..ab4bcf69 100644
--- a/metadata/swamid-sp-2.0.mxml
+++ b/metadata/swamid-sp-2.0.mxml
@@ -389,7 +389,6 @@
   <xi:include href="swamid-2.0/sunet.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/supr.naiss.se.xml"/>
-  <xi:include href="swamid-2.0/supr.snic.se.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml"/>