Merge branch 'master' of git.swamid.se:swamid-metadata

21 files changed, 263 insertions, 100 deletions

diff --git a/swamid-2.0.mxml b/swamid-2.0.mxml
index 0e23d57b..d40bb534 100644
--- a/swamid-2.0.mxml
+++ b/swamid-2.0.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
-                    xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                    xmlns:xi="http://www.w3.org/2001/XInclude"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-2.0.xml">
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
index ffa50739..caead5c0 100644
--- a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
@@ -11,6 +11,7 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
index d5116fe6..3a7685fc 100644
--- a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
+++ b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
@@ -37,6 +37,11 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml1-acs.php/Funk" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml2-acs.php/Funk" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml1-acs.php/Funk/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="sv">Funktionärsregistret</md:ServiceName>
+      <md:ServiceName xml:lang="en">Elected officials registry</md:ServiceName>
+      <md:RequestedAttribute 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="en">Montania System AB</md:OrganizationName>
diff --git a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml b/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
index 98ac4187..f780d4cd 100644
--- a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
+++ b/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
@@ -20,6 +20,7 @@
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-03T08:15:35Z">
@@ -33,7 +34,7 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">CnaaS MDU NAV</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CnaaS MDU NAV</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDU.</mdui:Description>
+        <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDU</mdui:Description>
         <mdui:Description xml:lang="en">Network monitoring system for CnaaS at MDU.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://nav.uninett.no</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://nav.uninett.no</mdui:InformationURL>
@@ -46,30 +47,34 @@
         <ds:KeyName>https://mdu-nav.cnaas.sunet.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=https://mdu-nav.cnaas.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCApSgAwIBAgIUAfcVTRChOX+ilOvp9bCBtFtigMUwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIFLDCCAxSgAwIBAgIUOowLHafDMzMzwfr46PL8fysuqW8wDQYJKoZIhvcNAQEL
 BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMB4X
-DTIyMDMwMjE2MDgxNloXDTMyMDIyODE2MDgxNlowKTEnMCUGA1UEAxMeaHR0cHM6
-Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A
-MIIBigKCAYEAzNlAkGch3YE9t6YgACkRlIQK5XrW11lr1e9Fkuz8K/+uF3eFWOsy
-P7aDLpCUqLu5Bvc4vb6/AxnWbyTv549BMqKfC1LhHs2cTmL/QYNUfd6qtayPBhxt
-e6PZpZ6qrnRCLOi8VDqYuZ49hK82FEMBHG2GqlA6gdjqrI2jbTWbTjVivxuPivFN
-wgxRmXA7Vzp+YlAtaEQgN9TYqTe/CV3tsutukjnvoIO9rNjiFwDgNNqiXsF/ZcIP
-7UquEAyQumOewd/L12HKxV5Iyz1kTfOEE3E+C8qtcSq2NVq3YZ98/mEKsQBjyJnF
-agbT1R84QAa4ctoaGBbvQORzqltX6TSVLfCkaGXmvDbHFh5EnqpYzsoJI+oNcmUw
-wIAejtyJilVruJizdrnJ9ojHxj55f5C+H7rLCOA7At3J/tvJ5hjFjHW5KjgohAvf
-yh1fnmKk6Z0//ZbjeW/A8QEzSjjGyjI5mfVI921aeGbMO5aOvozrLl2IRyoxIxAN
-QJ1CMKiLcGBZAgMBAAGjTDBKMCkGA1UdEQQiMCCCHmh0dHBzOi8vbWR1LW5hdi5j
-bmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQULek3qAksB+FrGYHPTEcktymYlj8wDQYJ
-KoZIhvcNAQELBQADggGBAFlS9yTd8/DHwPuRuIqZM72j8UCZjBOPgZ4qzNNjhz0Z
-iIpnn2+/Jc1e3goKv0BHd4Qr6r3wCIvzeQd+pJdtuHzbASttVY6tW3UYjb7yE7gw
-0L68YwnXFD4NIpo8dM+Tloua8ZhzpaCnxVjLZym5NkZqw+v9wx6j6Ehb5iOjRI/D
-sYXLi+M5B6pmthH15XXMSOGdFCvdW70z2WsH983KR9+4nXMsILZSHP33fdCmrWJp
-JPb71/W7KVq1vP5xFqGLAoNHZIDO8F+y5EdCxA5oRrfcQWLvquaSk88A/Aaw3m0Z
-AgePVmVPe3f9c0Ep1IhucbAc5FNeT1kJrYF7sKrM5/5rBFnoaKJ00UCsw+3s9Ix9
-avwKQDDizncyFDzGdNeJq0vsaBtTZKIQMil5u+KtE/LuHIp1LRIM+VtQqLXFgcWb
-wBqgQXRVl/CavUgz/wwCddpSpVOnccw82Qdi9fX363zpfm3hORKdMY/DBUcsrUSj
-V/ml76bFEofGNdbAHcbMsA==
-</ds:X509Certificate>
+DTIyMTExMTA5MTYwNFoXDTMyMTEwODA5MTYwNFowKTEnMCUGA1UEAxMeaHR0cHM6
+Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAuC5+Dyp766eub9kMYsSb6xd7FTqotqCG2GQxEymnEMB6uddGc0QX
+/mu5bhTBwPmoil5Tx0Yf9MFDh4wFMmQqhltEcr8zuAWgJQmfyYXmU8QA2XX1m4lb
+Sh2wYVhD1+aIC3gsEegcryfMxql6JhIsWsBUN+APgnulvy7npwaenrDv1VYjn8j4
+5XRXqYFbOS/dDCivg2JZXHK6lpnuiOqvNjnora9uwfOS6WD9AVCMtZdaYuk2jLo0
+TL45CXcEGCARudBj/C/0c0QLRCI5fYjPivThl1EIeqes7mDrDfUfGAXXkyEY4vuF
+21MbkD6QhC4xp+hmWuCX1ek4dAvx4Be7HZbEwtFfSF2tPs+pPMR7Wbr2CXdHfeOD
+VHE7SiPZXVVwJILfv0P1Ao67ou3jbtCeRuvKuV6sWDePVMtu6XQfcnpJfro3p7xc
+mfPThFO0GZYTkidqkklN12WHow+vTFRnOGQ59i8+BCMCpBFj0x04BZvnyYWOXrAN
+Jog4jALyjhJtVKIQPAAy604hT0qhN1qoCxLKkRKRVRu2gvEQpYuPoTvT0k9WTBjd
+4gaFCiSin8Y3lSfIgFkpksMBEnfcVtJNG2htKKXTATuXmuat9I+VBTdigCBPlzMr
+Tgw4NibnuihosJoGZn1p/4ll+gX5JJ9CwDFS+MhgY4HhN1E5/H8keNECAwEAAaNM
+MEowKQYDVR0RBCIwIIIeaHR0cHM6Ly9tZHUtbmF2LmNuYWFzLnN1bmV0LnNlMB0G
+A1UdDgQWBBQY8DklOJVTDzKZH00kWeyZptlwgDANBgkqhkiG9w0BAQsFAAOCAgEA
+SiHcXxHBZhNVX8TQsnMj9tofono8lWSp3+RNH4sCVldKt9Mymk6lLdp+NSAwS1RA
+eqg7mtkOZd3BpOFtnZFKcTCocQO3msqS53VJD2zoCurnzjLlI1IKznEfw6GWL6B5
+B2AX4ItLGm8VycYf3ljUsCfKcBa/sEMlVGVo8eb1VUrdmWJNoEBPvS9pQNRoRZ+T
+5z4eDfMvBqniHmxmguF4v2v9aixC620sFTZ/ggwe5B1vkJ8bdykP5ITCF4UcCJ/M
+4vGvJbuXvjm9bjei54Ot5az/IvbUcVyThboaFb2e2E3+pS2nYx2k+xMLl70wPFQg
+beXYFlphlMZfOpdDsLFyLvO6g9S7ZdYGljrCDqiMAFK32OYsiI81FQXS4Icdqw2g
+ZXLLdKKQtosbFEzhdWQvobzAE1QgunZqTmy4MCetuVv/2qwbH9PzJnp+OkN6k8Mg
+kuC5RYE0YWieV8eTuCmK9VAbjk3hL80vhwQBDtbUMx9ZNSAezEt+e10fvYiw+xOl
+jzFg2EOoZNFhjZNALE/JCPYr6VMv16eCmURo25vE7U31sJnORyLs+pCbBRprzSpd
+ZaCP3V1IqZ/OnGG19co5sS1MDwh6Mdfui8fizt+ZMXisfthDjfVHFxaiz1DP5g9d
+hzESbKUtry32f5UndGS1iWU7Fr2zvh6atywcB1Jg9Ao=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -96,10 +101,10 @@ V/ml76bFEofGNdbAHcbMsA==
     </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:OrganizationName xml:lang="sv">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Sunet</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>
@@ -116,7 +121,7 @@ V/ml76bFEofGNdbAHcbMsA==
     <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:GivenName>Paulo Pamplona</md:GivenName>
+    <md:EmailAddress>mailto:paulo@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/monitor.social.sunet.se.xml b/swamid-2.0/monitor.social.sunet.se.xml
new file mode 100644
index 00000000..459b6beb
--- /dev/null
+++ b/swamid-2.0/monitor.social.sunet.se.xml
@@ -0,0 +1,124 @@
+<?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://monitor.social.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-11-29T14:29:20Z">
+      <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>https://refeds.org/category/personalized</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://monitor.social.sunet.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://monitor.social.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="en">Internal tool to monitor Sunet Social</mdui:Description>
+        <mdui:Description xml:lang="sv">Internt verktyg för att övervaka Sunet Social</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Sunet Social Monitor</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Sunet Social Monitor</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://social.sunet.se/about</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://social.sunet.se/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://social.sunet.se/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://social.sunet.se/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>d7046d6345e0</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=d7046d6345e0</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE9jCCAt6gAwIBAgIUEtNroieBEV4nrd2eDRZuRyIK7FMwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAxMMZDcwNDZkNjM0NWUwMB4XDTIyMTEyOTEyNTg0N1oXDTMy
+MTEyNjEyNTg0N1owFzEVMBMGA1UEAxMMZDcwNDZkNjM0NWUwMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAuPKzeN1Yn8ykVh/ssdmDpLhpnfebgjlPRo/4
+yTwrIz4+d5pjNHZ1uqB0hCmd8J7n5BtVYL68ItmG8uLpgQlo4kyS5l1IVzWVtt7u
+ZCnptOH/8xwX+5HA6oo7g7OQsp0ydefrbHu4PU1Q7S5xpsR3xrl0sulS9AyuuapC
+LuSlRADWw5I4yvQQLFGmVA8bM9G5aAk4wmGtRrRf652ZYanT3aldz3qF5rkK9+bg
+EsiEzAws50PAK62WcGFnwWsCr//Q0ZaWhq8b6LzCuefomEV2q0nH+Wip86s6cobm
+v9aa46vxxtPubRe8E1TRJ9iYMewy+NDMTCPfA1jv6DX28Fg60T7M53e6Vw4IMYC0
+6DhITzjg5rXSlbiqRL9y4DDk+CChrDcKXRGlQzSgHQSQgF4eEG5AVwcnfpS1Y/Y+
+hHMJZyXd5EnPfeSvheobZeAd3GV05OcZSjkzay4BFkSCYWyeDrwX0AN3e6+Xe/nM
+nnNnhIJM/cny5T2+TtZVYppcPuVNJ7cNJpo9M1HnN5ugoxdn7dXeweCKP2W3HsWm
+gxV6EPXMAYzFmLSRJeC8TF1vWIN+10r8VyObAhNKv0YgZFZKmXLpHFHWnRvqAwZG
+aGsMK19oa39siqTIXKKG2cqEO7TcVch5uzm8Xs6Z0f4O9WzPIZifWfVO3s9nHkow
+vS8pKA8CAwEAAaM6MDgwFwYDVR0RBBAwDoIMZDcwNDZkNjM0NWUwMB0GA1UdDgQW
+BBT8y/ZIhtKU8ZIgOq+6xGEY7aUR9zANBgkqhkiG9w0BAQsFAAOCAgEAfr2JGpQ3
+ohgTOJH7D87JslGDPM9IQWAEvsYQbGP2941yBb5/Nc9EJTAFmGqQkivWAZJpf59v
+o6sKTJPzJq0HH3emD21d/TbHV5/Y6KBOojK8edIbE6AGuHTkA/3aMc7DrqZr1ZRM
+LGNsFQi53UG2ynsMJDVHfPAZs4+xvwmIYC7DnB/iQMtLifY903k+d2nUUL19MZhW
+grq9WjYdFcq/XCv3ER7aJ+kV1HZy/rmf5gDbku+VCQxeUlJKt3mVfkxPBDzkipdt
+8R2vQrTCQ6NvB6Oac29m+TaTrK+bNGqu8oEx90nDndPgRUzVfkm5RFznNEgwHnQj
+CZyKyVrc/sWIEULoUSFubjvNLMpgarGCXs8QFZM2L4XaqjPjNc6lIm22t2mb7DEP
+JgQjYJqVrsi1ayiXtuCcVv/NJ/rtnPkrjxntARYzX1Re4XoUiRMYXHKlr+igsk62
+hdU8c/oXphsQziW+M/KLEIReWWyTvhbEIrnUUQAk9IpQf4OYAXakOFBk/kbqACNT
+sm4hz4tdcbbHH4MjX6Rsw4MCMp5MmJp1nuOcS7UPe/UIZ8bGtBojN9dWrY/R7djh
+Fks6CTh4GqR9bs6uxignTcJj2jBid1xUtLgWD4uAl4CxUobLmTl6KkhIXr2p51Tx
+u3OR1GwgImWzMfiutJODW+doj0U7K/olBnI=</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://monitor.social.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.social.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.social.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.social.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://monitor.social.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.social.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Monitor for Sunet Social</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Övervakning för Sunet Social</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sunet Social</md:GivenName>
+    <md:EmailAddress>mailto:social@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet Social</md:GivenName>
+    <md:EmailAddress>mailto:social@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sunet Social</md:GivenName>
+    <md:EmailAddress>mailto:social@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>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-hhs-staff.xml b/swamid-2.0/se.timeedit.net-hhs-staff.xml
index 092c1eea..b06b3443 100644
--- a/swamid-2.0/se.timeedit.net-hhs-staff.xml
+++ b/swamid-2.0/se.timeedit.net-hhs-staff.xml
@@ -8,10 +8,14 @@
   <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="false">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">TimeEdit för anställda vid Stockholm School of Economics</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">TimeEdit for employees at Stockholm School of Economics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
         <mdui:Description xml:lang="en">TimeEdit, developed by TimeEdit AB</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://ex.hhs.se/swamid/sp/timeedit/TimeEditInformationEN.htm</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ex.hhs.se/swamid/sp/timeedit/TimeEditPrivacyEN.htm</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">TimeEdit för anställda vid Stockholm School of Economics</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="sv">https://ex.hhs.se/swamid/sp/timeedit/TimeEditInformationEN.htm</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ex.hhs.se/swamid/sp/timeedit/TimeEditPrivacyEN.htm</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -41,9 +45,29 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://cloud.timeedit.net/hhs/web/timeedit/ssoResponse/saml2_staff"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TimeEdit AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TimeEdit AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.timeedit.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.timeedit.com</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>SSE Service Desk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@hhs.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>SSE Service Desk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@hhs.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>SSE Federation Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:its.security@hhs.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-discovery.mxml b/swamid-discovery.mxml
index 74333f9b..bcc76784 100644
--- a/swamid-discovery.mxml
+++ b/swamid-discovery.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
-                    xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                    xmlns:xi="http://www.w3.org/2001/XInclude"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-no-interfederation-combined.xml">
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-edugain-1.0.mxml b/swamid-edugain-1.0.mxml
index c1b009aa..67cbded1 100644
--- a/swamid-edugain-1.0.mxml
+++ b/swamid-edugain-1.0.mxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-edugain-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
+<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-edugain-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H">
   <xi:include href="swamid-edugain-idp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-edugain-sp-1.0.mxml" xpointer="xpointer(//*[@entityID])"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-edugain-testing-1.0.mxml b/swamid-edugain-testing-1.0.mxml
index b26c05e5..55639308 100644
--- a/swamid-edugain-testing-1.0.mxml
+++ b/swamid-edugain-testing-1.0.mxml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
+<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H">
   <xi:include href="swamid-edugain/idp.nordu.net-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml b/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
index fc503020..b8efcb0f 100644
--- a/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
@@ -12,6 +12,8 @@
       <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml b/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
index 16f00c0f..e10f0f72 100644
--- a/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
@@ -13,6 +13,10 @@
       <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -40,18 +44,14 @@
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=
-          </ds:X509Certificate>
+          <ds:X509Certificate>MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=
-          </ds:X509Certificate>
+          <ds:X509Certificate>MIIDqTCCApGgAwIBAgIUJvJG3zA1H52oNzOAXoQe57Mk9AwwDQYJKoZIhvcNAQELBQAwZDELMAkGA1UEBhMCU0UxDDAKBgNVBAgMA1ZHUjEMMAoGA1UEBwwDR0JHMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMRgwFgYDVQQDDA9pZHAuY2hhbG1lcnMuc2UwHhcNMjAwNzIwMTIzNTI4WhcNNDYwMzExMTIzNTI4WjBkMQswCQYDVQQGEwJTRTEMMAoGA1UECAwDVkdSMQwwCgYDVQQHDANHQkcxETAPBgNVBAoMCENoYWxtZXJzMQwwCgYDVQQLDANJVEExGDAWBgNVBAMMD2lkcC5jaGFsbWVycy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPuaynUvXy5n8He3Jefpxz2ELpaXM9mzhiLlF6NK41XJeLo7OsLD0l3kQH2AXQMXvkKV0hoh/dwxlUImj/jCCpBpdF8z4LmYtz4/+FNYq+fMSCf/TkhB2AbLJbPD+AT+yrrlPr3R7Smjd0emtgPWM20NcbBflTM9Uh2jZMeQLHSJu3dIoRW4cdZOKgwonVMTaocccDxxEMQUqE6k/mYCFmCVEYIGLBnkDPSixNIDtzY+WY70bN12HLwLhPhxCz8wS3C/NhXF5gNoChXcfUB3Fxw4lY4GuH49D5cwyvtVNNJR1uCVJFlSbj+xe9bjqjkKwal78iPcxSTLD1SBxPeia1kCAwEAAaNTMFEwHQYDVR0OBBYEFLHkg8AuJUdGvsY0mwofGr9cHWGfMB8GA1UdIwQYMBaAFLHkg8AuJUdGvsY0mwofGr9cHWGfMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC2nyf2NAWnIpedq7cA4tJsodhxDFNSS6tPPav4MypL2rC46a0W/YL5QJn32qoFTMJNfLglu2NWUfUeSKD22XlH/PKV4z/BPFtC9EXNmNbp2aBXSnoC5rmNr1VL/RgTPHL9ebx7BkpM+y/zAbLOeyKtlfumzDt30PrZAImcIHOp7LqkZjmb4RQFHWZc62pzbNjrXhywbTK3ry6K0U7gk1SvWxjD6U/cWSASaYotqWJryWoo7pVcLTGUUYmfCNi+IGINW+KRhUuH4W7+1STwh104kedGkUcbhXaNGtEpqQPwhNFnEnKZFiKy74rN/Ks2Puvinr2CeoSlfk1mRQSkiGxk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-edugain/idp3.hig.se-idp-shibboleth.xml b/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
index f2432e7e..cdb84a6e 100644
--- a/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
+++ b/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
@@ -13,6 +13,9 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -24,14 +27,14 @@
         <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
         <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="83" width="94">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="83" width="94">https://reset.hig.se/head/loggaengelska.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
         <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
         <mdui:InformationURL xml:lang="sv">https://hig.se/Ext/Sv/Om-Hogskolan.html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://hig.se/Ext/En/University-of-Gavle/About-the-University.html</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.hig.se/Ext/Sv/-Om-webbplatsen/Om-webbplatsen/Behandling-av-personuppgifter---IDP.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.hig.se/Ext/En/University-of-Gavle/Om-webbplatsen/About-the-website/Processing-of-personal-data---IDP.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="83" width="94">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="83" width="94">https://reset.hig.se/head/logga3.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>hig.se</mdui:DomainHint>
@@ -45,8 +48,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUb49uwCfYwUsxLAS4QX52Z+LGD/owDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUb49uwCfYwUsxLAS4QX52Z+LGD/owDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI2WhcNMzYx
 MTE2MTQzNDI2WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAI+kkAfT+diALb7gF1jLrQts59EwS6MM0WId9Zcb
@@ -62,16 +64,14 @@ pYPm7XjUfmrQhxtaVp9aCLGgaKB3QZ2AWWqe8wlin2oVA80c3vwqNERwanwh8HXy
 KY9+Pk/xM4SccOG5d7Fli9/DMMtA9lCfcB+VvkEvyB0JXncAoduMFuJWeDH1+YNj
 X06y0H12Vb0MAOdX+ZwUDCcljRTXs/Xz17JlPEIA573fpUUX9iUGHapyi49Lf6P3
 emKBZGVGPtOEIkuwUNjvkAXxTdSqztW3tHz/4c4yAXRIyKtwi4zrWYCw8pPnz2LN
-fZ9x1HnkUO7tsnLp4MMfANCrRtVqNZuBaHjV
-                        </ds:X509Certificate>
+fZ9x1HnkUO7tsnLp4MMfANCrRtVqNZuBaHjV</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIURDaPmh4fojI5RTQlsw6odpGuJ9IwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIURDaPmh4fojI5RTQlsw6odpGuJ9IwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
 MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAJNac0ev7kxZgrXM1GL1XM3rnBiD8PsiaFHFB5fn
@@ -87,16 +87,14 @@ zuIv4hvKuLUfyjryH8igCl8361zkjkiOw5vJqCTIpmIsH+OkxqL88H6GOr2jzAQ5
 53f8zLmNSi6ThwTWRfUIGc7qu+zbjPUh3fi3JRiJXmye8DiOvr0vTOManWtsnab5
 +70k82K16/LTroAtsoL5ILTpP0XH/f5UzEnrUP5seaFMP+zA4n2ps4jc1h7kLkfb
 UAZ6TEcqZzYGuUQhgz7Q4dwexohnWyfJXSzADbEgxqYrG6M4OUhMsVSYwsx06oQz
-MfV1UqCXysIAIN4hzYWJPMBj/EBD8cha92n8
-                        </ds:X509Certificate>
+MfV1UqCXysIAIN4hzYWJPMBj/EBD8cha92n8</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUd7xvAjohRdOXVDSf0wu3l75uPbMwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUd7xvAjohRdOXVDSf0wu3l75uPbMwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
 MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAJ1KSzfqvoHf3493SBKtumXDyZWRZsLqFUXcwvmX
@@ -112,8 +110,7 @@ eImEmbKZ7P3QvO3/e7tVlt+Ld4eWPDd/wftpV4kWXincS3XooEJroDSAFjrS4jEn
 86ZQk8ujVLMVWwHh+c4qbKt5b4ENpc628+i2MTzEqTCzYB7GZJgFSej9Qzdnz7P4
 wKRijhkjyNeyPebflCRaA5XoYfBNdabJy+bqTxTbbfpev0PCIXSzWMK6+ZwFtlJ8
 D7xYfJe/x9FrVnIZHPsrwj3ekyL0qpQ4Bs1BFkKDe0bpcyVSrrV0txbaJxnWcgQE
-uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
-                        </ds:X509Certificate>
+uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -132,8 +129,7 @@ uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUb49uwCfYwUsxLAS4QX52Z+LGD/owDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUb49uwCfYwUsxLAS4QX52Z+LGD/owDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI2WhcNMzYx
 MTE2MTQzNDI2WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAI+kkAfT+diALb7gF1jLrQts59EwS6MM0WId9Zcb
@@ -149,16 +145,14 @@ pYPm7XjUfmrQhxtaVp9aCLGgaKB3QZ2AWWqe8wlin2oVA80c3vwqNERwanwh8HXy
 KY9+Pk/xM4SccOG5d7Fli9/DMMtA9lCfcB+VvkEvyB0JXncAoduMFuJWeDH1+YNj
 X06y0H12Vb0MAOdX+ZwUDCcljRTXs/Xz17JlPEIA573fpUUX9iUGHapyi49Lf6P3
 emKBZGVGPtOEIkuwUNjvkAXxTdSqztW3tHz/4c4yAXRIyKtwi4zrWYCw8pPnz2LN
-fZ9x1HnkUO7tsnLp4MMfANCrRtVqNZuBaHjV
-                        </ds:X509Certificate>
+fZ9x1HnkUO7tsnLp4MMfANCrRtVqNZuBaHjV</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIURDaPmh4fojI5RTQlsw6odpGuJ9IwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIURDaPmh4fojI5RTQlsw6odpGuJ9IwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
 MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAJNac0ev7kxZgrXM1GL1XM3rnBiD8PsiaFHFB5fn
@@ -174,16 +168,14 @@ zuIv4hvKuLUfyjryH8igCl8361zkjkiOw5vJqCTIpmIsH+OkxqL88H6GOr2jzAQ5
 53f8zLmNSi6ThwTWRfUIGc7qu+zbjPUh3fi3JRiJXmye8DiOvr0vTOManWtsnab5
 +70k82K16/LTroAtsoL5ILTpP0XH/f5UzEnrUP5seaFMP+zA4n2ps4jc1h7kLkfb
 UAZ6TEcqZzYGuUQhgz7Q4dwexohnWyfJXSzADbEgxqYrG6M4OUhMsVSYwsx06oQz
-MfV1UqCXysIAIN4hzYWJPMBj/EBD8cha92n8
-                        </ds:X509Certificate>
+MfV1UqCXysIAIN4hzYWJPMBj/EBD8cha92n8</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUd7xvAjohRdOXVDSf0wu3l75uPbMwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUd7xvAjohRdOXVDSf0wu3l75uPbMwDQYJKoZIhvcNAQEL
 BQAwFjEUMBIGA1UEAwwLaWRwMy5oaWcuc2UwHhcNMTYxMTE2MTQzNDI1WhcNMzYx
 MTE2MTQzNDI1WjAWMRQwEgYDVQQDDAtpZHAzLmhpZy5zZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBAJ1KSzfqvoHf3493SBKtumXDyZWRZsLqFUXcwvmX
@@ -199,8 +191,7 @@ eImEmbKZ7P3QvO3/e7tVlt+Ld4eWPDd/wftpV4kWXincS3XooEJroDSAFjrS4jEn
 86ZQk8ujVLMVWwHh+c4qbKt5b4ENpc628+i2MTzEqTCzYB7GZJgFSej9Qzdnz7P4
 wKRijhkjyNeyPebflCRaA5XoYfBNdabJy+bqTxTbbfpev0PCIXSzWMK6+ZwFtlJ8
 D7xYfJe/x9FrVnIZHPsrwj3ekyL0qpQ4Bs1BFkKDe0bpcyVSrrV0txbaJxnWcgQE
-uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
-                        </ds:X509Certificate>
+uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml b/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
index affcab5f..113c7f0c 100644
--- a/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
@@ -18,12 +18,14 @@
         <mdui:DisplayName xml:lang="en">Sophiahemmet University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Sophiahemmet Högskola.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Sophiahemmet University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.sophiahemmet.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.sophiahemmet.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.shh.se/sv/om-webbplatsen/behandling-av-personuppgifter/swamid-tjanstedefinition/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.shh.se/en/general-description-of-saml2-websso/</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
         <mdui:Keywords xml:lang="en">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.shh.se/sv/om-webbplatsen/behandling-av-personuppgifter/swamid-tjanstedefinition/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.shh.se/en/general-description-of-saml2-websso/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>sophiahemmet.se</mdui:DomainHint>
@@ -97,10 +99,12 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SHH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Sophiahemmet University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.shh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Sophiahemmet University</md:Company>
diff --git a/swamid-idp-transitive.mxml b/swamid-idp-transitive.mxml
index 50b683c0..fc94f6a0 100644
--- a/swamid-idp-transitive.mxml
+++ b/swamid-idp-transitive.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
-                    xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                    xmlns:xi="http://www.w3.org/2001/XInclude"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-2.0.xml">
   <xi:include href="swamid-idp.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-interfederations-idp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-idp.mxml b/swamid-idp.mxml
index 43c87daf..ca96b504 100644
--- a/swamid-idp.mxml
+++ b/swamid-idp.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
-                    xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                    xmlns:xi="http://www.w3.org/2001/XInclude"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-2.0.xml">
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
 </EntitiesDescriptor>
diff --git a/swamid-registered.mxml b/swamid-registered.mxml
index c12dce29..94030ae5 100644
--- a/swamid-registered.mxml
+++ b/swamid-registered.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
-                    xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                    xmlns:xi="http://www.w3.org/2001/XInclude"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-registered.xml">
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 93646882..5af504f3 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -262,6 +262,7 @@
   <xi:include href="swamid-2.0/miunid.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-2.0/monitor.drive.sunet.se.xml"/>
   <xi:include href="swamid-2.0/monitor.drive.test.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/monitor.social.sunet.se.xml"/>
   <xi:include href="swamid-2.0/monitor.swamid.se.xml"/>
   <xi:include href="swamid-2.0/monitor.test.swamid.se.xml"/>
   <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.xml"/>
diff --git a/swamid-sp-transitive.mxml b/swamid-sp-transitive.mxml
index b4c8f905..8cc17273 100644
--- a/swamid-sp-transitive.mxml
+++ b/swamid-sp-transitive.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
-                    xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                    xmlns:xi="http://www.w3.org/2001/XInclude"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-sp-transitive.xml">
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-interfederations-sp-2.0.xml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-testing-1.0.mxml b/swamid-testing-1.0.mxml
index a89e8b4f..345679a3 100644
--- a/swamid-testing-1.0.mxml
+++ b/swamid-testing-1.0.mxml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
                     xmlns:xi="http://www.w3.org/2001/XInclude" 
-                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT24H"
                     Name="http://md.swamid.se/md/swamid-testing-1.0.xml">
   <xi:include href="swamid-idp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
   <xi:include href="swamid-sp-2.0.mxml" xpointer="xpointer(//*[@entityID])"/>
diff --git a/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml b/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
index 02d56ba1..d0aea279 100644
--- a/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
+++ b/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
@@ -9,15 +9,20 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
       </samla:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category-support" 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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Application submission for use of the national 7T facility in Lund</mdui:Description>
-        <mdui:Description xml:lang="sv">Ansökningshantering till nationella 7T anläggningen i Lund</mdui:Description>
-        <mdui:DisplayName xml:lang="en">National 7T facility</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Nationella 7T anläggningen</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test ADFS Server for Swedish Red Cross University</mdui:Description>
+        <mdui:Description xml:lang="sv">Test ADFS Server för Röda Korsets Högskola</mdui:Description>
+        <mdui:DisplayName xml:lang="en">TEST ADFS Swedish Red Cross University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">TEST ADFS Röda Korsets Högskola</mdui:DisplayName>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
@@ -46,8 +51,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.rkh.se/adfs/ls/" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.rkh.se/adfs/ls/" index="1"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">National 7T facility</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Nationella 7T anläggningen</md:ServiceName>
+      <md:ServiceName xml:lang="en">TEST ADFS Swedish Red Cross University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">TEST ADFS Röda Korsets Högskola</md:ServiceName>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -75,14 +80,14 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">National 7T facility</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Application submission for use of the national 7T facility in Lund&lt;</mdui:Description>
+        <mdui:DisplayName xml:lang="en">TEST ADFS Swedish Red Cross University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test ADFS Server for Swedish Red Cross University</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:InformationURL xml:lang="sv">https://www.rkh.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="sv">Nationella 7T anläggningen</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ansökningshantering till nationella 7T anläggningen i Lund</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">TEST ADFS Röda Korsets Högskola</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test ADFS Server för Röda Korsets Högskola</mdui:Description>
         <mdui:Logo xml:lang="en" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
       </mdui:UIInfo>
@@ -112,8 +117,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish Red Cross University College</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Röda Korsets Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">[TEST] Swedish Red Cross University College</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">[TEST] Röda Korsets Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.rkh.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.rkh.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-testing/idp-test.suni.se-adfs-services-trust.xml b/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
index 9c43c611..ea340c97 100644
--- a/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
+++ b/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
@@ -13,6 +13,7 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>