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

21 files changed, 385 insertions, 50 deletions

diff --git a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
new file mode 100644
index 00000000..88bf3ec3
--- /dev/null
+++ b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="dev.lararlyftet-validering.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lärarlyftet Validering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lärarlyftet Validation</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Valideringssystemet för Lärarlyftet</mdui:Description>
+        <mdui:Description xml:lang="en">This service is the validation system for Lärarlyftet</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhr-1297.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhr-1297.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAK9uhgtga6STMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXVoci0xMjk3LmkudWhyLnNlMB4XDTE0MTIwMjEyNDgyM1oXDTI0MTEyOTEy
+NDgyM1owHDEaMBgGA1UEAxMRdWhyLTEyOTcuaS51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDSxkWORCuz0qV48LpqRMlD6H4eEe8tbGAvr0N2
+KBmz+l9FBeCBr3Q8NgTeBBnMa23i3VbEdB1016jdJ0h9jXMHN1AQMd/3tR2EoWWM
++VjFmffjIfF0LBYyHJakmnEKmdIwjKPiVqOgwlS+a9af/wiI8XnD8sIaqFopaoA1
+hKKuANSR/TVOkDhKfdaBQcDUCyww2/sGBthhDdlC0rpgRr6nA/vbrjsYRC7PE6js
+2wFzTcMkF9gjeduKZDwpRqQdkSkIL2K1/ZBptaPOOaal6fpve6AcxmjSWZHmR3Tb
+x6ylG3e+B8O8ArwyNyam4TSMhFO57GqVuAtD8Q4uRdq3XSUzAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXVoci0xMjk3LmkudWhyLnNlMB0GA1UdDgQWBBR9FQbRYBUqAd81
+DwOhDd+M8XDmyjANBgkqhkiG9w0BAQUFAAOCAQEAd68cfIyNUjLMpTTQuKQBJs9W
+im084wgTvsAdycV9EbYuuLrQhALQuTuGhBf8qZY16gx23ICpn12nwcXdu02Xcg5U
+xK8cv3PFIgOcXB00dfmOkwwzgtZkYuRZz4bzf4TgrQv9vMhrVJEwHPog4HuU6N8l
+JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
+3N5QAVVFxkbyHn+8RkZQZ9FiWh7Yl56wU3gvGnZrPT2AaJtVaW4cQkw0gL+dAYfm
+3osR1KprOY0+GpXcvgi9X9YlLMzfcsBIiCEoV4wjwziY99phU80XLkFKmYLsmA==
+</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://dev.lararlyftet-validering.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
index fff3c3bf..1a72917b 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
@@ -3,6 +3,7 @@
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/play.kau.se.xml b/swamid-2.0/play.kau.se.xml
index 9415b93a..2a0da45b 100644
--- a/swamid-2.0/play.kau.se.xml
+++ b/swamid-2.0/play.kau.se.xml
@@ -2,7 +2,7 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.kau.se">
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.or g/entity-category">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
diff --git a/swamid-2.0/portal.mdh.se-shibboleth.xml b/swamid-2.0/portal.mdh.se-shibboleth.xml
index b79db3f5..38b1b80c 100644
--- a/swamid-2.0/portal.mdh.se-shibboleth.xml
+++ b/swamid-2.0/portal.mdh.se-shibboleth.xml
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.mdh.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.mdh.se/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Studentportal MDH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Student portal MDH</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Denna applikation används för att registrera sig på kurs på MDH.</mdui:Description>
+        <mdui:Description xml:lang="en">This service is used for registering at course at MDH.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.mdh.se/student/service/studentportalen-1.260?l=sv_SE</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.mdh.se/student/service/studentportalen-1.260?l=en_UK</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.mdh.se/gemensamt/webbplatsen/juridisk-information-1.205?l=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.mdh.se/gemensamt/webbplatsen/juridisk-information-1.205?l=en_UK</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/prep.math.su.se-shibboleth.xml b/swamid-2.0/prep.math.su.se-shibboleth.xml
index 385a9915..afac61f7 100644
--- a/swamid-2.0/prep.math.su.se-shibboleth.xml
+++ b/swamid-2.0/prep.math.su.se-shibboleth.xml
@@ -5,6 +5,8 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/produktwebb.uu.se-shibboleth.xml b/swamid-2.0/produktwebb.uu.se-shibboleth.xml
index a0343755..4571fae0 100644
--- a/swamid-2.0/produktwebb.uu.se-shibboleth.xml
+++ b/swamid-2.0/produktwebb.uu.se-shibboleth.xml
@@ -3,6 +3,7 @@
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/registrera.hb.se-shibboleth.xml b/swamid-2.0/registrera.hb.se-shibboleth.xml
index 74973c2b..e4e7dc02 100644
--- a/swamid-2.0/registrera.hb.se-shibboleth.xml
+++ b/swamid-2.0/registrera.hb.se-shibboleth.xml
@@ -11,6 +11,14 @@
     </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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">HB Registrering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HB Registration</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studentportal för registrering och kontoskapande på Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Studentportal for registration and account creation at Högskolan i Borås.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>registrera.hb.se</ds:KeyName>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index 2607b8bf..1de3f0b0 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -17,6 +17,14 @@
     <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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>
@@ -30,6 +38,12 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://registrera.hb.se/Shibboleth.sso/DS/ds.swamid.se"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://registrera.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://registrera.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">HB SelfService</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HB SelfService</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Självhjälp för Högskolan i Borås studenter. Lösenordsbyte, spärrning av passerkort, verifiering av e-post &amp; mobilnummer</mdui:Description>
+        <mdui:Description xml:lang="en">Self service application for students at Högskolan i Borås. Password recovery/change, reporting lost accesscards, verifying e-mail and cellphone numbers.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index a1a73226..b1c402e0 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -23,19 +23,23 @@
         <ds:X509Data>
           <ds:X509Certificate>
 
-MIICZjCCAc+gAwIBAgIJAPC0l1XObymOMA0GCSqGSIb3DQEBBQUAMEwxCzAJBgNV
-BAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMQwwCgYDVQQKDANVSFIxGjAYBgNV
-BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTEzMDYxMzA4NDcxMVoXDTE2MDYxMjA4
-NDcxMVowTDELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxDDAKBgNV
-BAoMA1VIUjEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAKzNLfSUeKCinwoHoPaYDc0MohU7CoaaIK8If5fIXlS0
-zv6vBu/kcvOqaIJ62QHyq0iQ9MeP6Tfzfnq4lc96NRzIJQEBmb9hrKWaGfZVEpWX
-I9zGg68FuODU5AhB+GhZNy4PmjlmnTDJFR1N+EJQiNAjg/xYwqvQ2TA16NwR2AsB
-AgMBAAGjUDBOMB0GA1UdDgQWBBTrKQPp1ulcWvun0MygkxGXORoRyTAfBgNVHSME
-GDAWgBTrKQPp1ulcWvun0MygkxGXORoRyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4GBAC1y0y1G1HK7av+aCLvxhTnAJr1KLkpGzvh1UJ0G2G/CF1TDRMpq
-rt/Ln4vzVuFRP5vg+tL8a4YTmg6nG4spKDmDPNyNs52LWX5GikxWEEaobOo/366B
-g3K9tR/NfPn3yNgy/kBRABuYJVjrtsbq/1PJ6Kg807taKYrz+vyERbn0
+MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTE0MTIxODEzMDAxOVoXDTI0MTIxNTEz
+MDAxOVowHDEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC0ZeAWa/eGw+QxcBP6yjkGd1B+8aC+z29O3IJ5
+u171uRRfilAcCPQR6/t4O+dpLCTg17y7kACVc113sUr90G5qzYPRv9xW//FeG+Se
+uATy5+As8uh8E0J4WnScx9G0GwYsmbkXncit7EATOBJi468bD6+K2N10PWHouqIF
+fPIv+MVPRSYQnqCk5+PvEzq56izBxpWfAHcO3TmCQ3Y+UEtYcEB+dcFdPpMAfFlv
+YJySvsCwy4VBWY6atqFhsMUWIKQp042/DB18eUmvzYA4n+tR8E9WQTKza/AtOZZF
+VL1qOJRqrV/bc6z81KpAX9PuZr8bC7POAtI2QYYy6dEdP149AgMBAAGjUDBOMB0G
+A1UdDgQWBBSb+Wr9vnHPBITF2fo5iQr+eximeTAfBgNVHSMEGDAWgBSb+Wr9vnHP
+BITF2fo5iQr+eximeTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAb
+PjD0cLzg6cM8Ftuyhs/fRttJuK2O8yTUBbZh0khY8XFwNaT1f7noOx7nw9XL/ZdU
+Fbedb+z/ncMmYhiB18wBxnNnAy0BK0Udef/gCtqPKlRxkxCuOMeQe92zrsYoqQgA
+VoZ0+1oHRCzBg6hzeGypg2AcnV46y58F6RNdLJAINLCJ7Flzh35b9M9Xzuxv6t9c
+rxFkRKuKa3AqBppaQFub7FoEeZlMruDJpp2LuC+8ML2BqQLf6ZqfgrX3dHBbLpa6
+jEOshjUyWKPPqAY3pnb71DVlMcLEcEK97YYQtYK/ZvnyFVRPpQ5FWBx9PsuLvKjY
+UIW4Y6GzlL7EfXr31lnv
 
                     </ds:X509Certificate>
         </ds:X509Data>
@@ -60,19 +64,23 @@ g3K9tR/NfPn3yNgy/kBRABuYJVjrtsbq/1PJ6Kg807taKYrz+vyERbn0
         <ds:X509Data>
           <ds:X509Certificate>
 
-MIICZjCCAc+gAwIBAgIJAPC0l1XObymOMA0GCSqGSIb3DQEBBQUAMEwxCzAJBgNV
-BAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMQwwCgYDVQQKDANVSFIxGjAYBgNV
-BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTEzMDYxMzA4NDcxMVoXDTE2MDYxMjA4
-NDcxMVowTDELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxDDAKBgNV
-BAoMA1VIUjEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAKzNLfSUeKCinwoHoPaYDc0MohU7CoaaIK8If5fIXlS0
-zv6vBu/kcvOqaIJ62QHyq0iQ9MeP6Tfzfnq4lc96NRzIJQEBmb9hrKWaGfZVEpWX
-I9zGg68FuODU5AhB+GhZNy4PmjlmnTDJFR1N+EJQiNAjg/xYwqvQ2TA16NwR2AsB
-AgMBAAGjUDBOMB0GA1UdDgQWBBTrKQPp1ulcWvun0MygkxGXORoRyTAfBgNVHSME
-GDAWgBTrKQPp1ulcWvun0MygkxGXORoRyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4GBAC1y0y1G1HK7av+aCLvxhTnAJr1KLkpGzvh1UJ0G2G/CF1TDRMpq
-rt/Ln4vzVuFRP5vg+tL8a4YTmg6nG4spKDmDPNyNs52LWX5GikxWEEaobOo/366B
-g3K9tR/NfPn3yNgy/kBRABuYJVjrtsbq/1PJ6Kg807taKYrz+vyERbn0
+MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTE0MTIxODEzMDAxOVoXDTI0MTIxNTEz
+MDAxOVowHDEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC0ZeAWa/eGw+QxcBP6yjkGd1B+8aC+z29O3IJ5
+u171uRRfilAcCPQR6/t4O+dpLCTg17y7kACVc113sUr90G5qzYPRv9xW//FeG+Se
+uATy5+As8uh8E0J4WnScx9G0GwYsmbkXncit7EATOBJi468bD6+K2N10PWHouqIF
+fPIv+MVPRSYQnqCk5+PvEzq56izBxpWfAHcO3TmCQ3Y+UEtYcEB+dcFdPpMAfFlv
+YJySvsCwy4VBWY6atqFhsMUWIKQp042/DB18eUmvzYA4n+tR8E9WQTKza/AtOZZF
+VL1qOJRqrV/bc6z81KpAX9PuZr8bC7POAtI2QYYy6dEdP149AgMBAAGjUDBOMB0G
+A1UdDgQWBBSb+Wr9vnHPBITF2fo5iQr+eximeTAfBgNVHSMEGDAWgBSb+Wr9vnHP
+BITF2fo5iQr+eximeTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAb
+PjD0cLzg6cM8Ftuyhs/fRttJuK2O8yTUBbZh0khY8XFwNaT1f7noOx7nw9XL/ZdU
+Fbedb+z/ncMmYhiB18wBxnNnAy0BK0Udef/gCtqPKlRxkxCuOMeQe92zrsYoqQgA
+VoZ0+1oHRCzBg6hzeGypg2AcnV46y58F6RNdLJAINLCJ7Flzh35b9M9Xzuxv6t9c
+rxFkRKuKa3AqBppaQFub7FoEeZlMruDJpp2LuC+8ML2BqQLf6ZqfgrX3dHBbLpa6
+jEOshjUyWKPPqAY3pnb71DVlMcLEcEK97YYQtYK/ZvnyFVRPpQ5FWBx9PsuLvKjY
+UIW4Y6GzlL7EfXr31lnv
 
                     </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-2.0/sp-nya.bth.se-shibboleth.xml b/swamid-2.0/sp-nya.bth.se-shibboleth.xml
index c255eb20..0ee653d6 100644
--- a/swamid-2.0/sp-nya.bth.se-shibboleth.xml
+++ b/swamid-2.0/sp-nya.bth.se-shibboleth.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-nya.bth.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/sp.kau.se-shibboleth.xml b/swamid-2.0/sp.kau.se-shibboleth.xml
index 71d0e69a..b438d997 100644
--- a/swamid-2.0/sp.kau.se-shibboleth.xml
+++ b/swamid-2.0/sp.kau.se-shibboleth.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.kau.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.kau.se/Shibboleth.sso/Login"/>
diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml
index 6a5be909..2f143a5f 100644
--- a/swamid-2.0/sp.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sp.swamid.se-shibboleth.xml
@@ -3,6 +3,7 @@
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index f9a68027..42364d03 100644
--- a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tentaadmin.uhr.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -21,33 +17,45 @@ and do *NOT* provide it in real time to your partners.
     <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tentaadmin.uhr.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://tentaadmin.uhr.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TentaAdmin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TentaAdmin</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:Description xml:lang="en">Administration av tentamen och tentamensvakter.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>uhrweb01.i.uhr.se</ds:KeyName>
+        <ds:KeyName>uhrweb00.i.uhr.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrweb01.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAMcFfnC5ByAeMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXVocndlYjAxLmkudWhyLnNlMB4XDTE0MTExMTA2NTUzM1oXDTI0MTEwODA2
-NTUzM1owHDEaMBgGA1UEAxMRdWhyd2ViMDEuaS51aHIuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDxY/TjMz8pT7hfnMwoA1Lr+vHkyi+XeZDCwyxN
-bTguN/Fh4IomoiNShua8JSHo5za/Vn2Bftid+pC0x7CGMxW1LI21F0R/whRm76lS
-An8yvI/AYIcKN5yzP9EKaWsiRuaNpboW9pUu9s/P7OFazNFEvLpH2xEHCCFuxTWi
-pm6cHbl2KUgdG6WA9zHA7dkisEVUxFMdPxPc5LUadgObsuHYJJMirc1QGsRWrX5u
-83eDKjEnr/CkJLrELJGeuAdqPK9Pz3oqy+V908RHZlxlNjdhdi4KD5fP41GvJw+I
-jees/K0Y12VF0hp0Apjz5eDfFV5gHKLENUa1SKEGMe4mO6s3AgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXVocndlYjAxLmkudWhyLnNlMB0GA1UdDgQWBBQO0iVrm5vzZO2s
-5ztEcCYlJpz/aTANBgkqhkiG9w0BAQUFAAOCAQEASGy6PvD8BqzTBcAxMiewR4qQ
-yjjpNt8UNzcIldZV+DCdoP+wAJVlAWCw9fP8KHpnuH/qLp9SA2GYgaLxGxpF3uK8
-iZuxL4xwX68Ioo0rat78tGmnwEinK1e+UpRqHUKW9GjiFdyiQfi+yGlGKdwJNP92
-JliEDw+3FtXWWq7BzKyo6rZKPjbLHSjS+1/6C8yDFd9k7e+mQqpgUy587yddRK2H
-E0nPNhmRfzH1Ynsjd36kgeDb7ZRmAvGiD5Ja3JsoTJxiV5RQXNzMZG7dUw8+7rSi
-10PwJF/Gs0ANdfP/236EBo+mDTHasFoMD2TqAdZ3ugxhmJIElenC6gGNN+rofA==
+          <ds:X509SubjectName>CN=uhrweb00.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAIttKuiDsU10MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXVocndlYjAwLmkudWhyLnNlMB4XDTE1MDExNTE0Mzk0NVoXDTI1MDExMjE0
+Mzk0NVowHDEaMBgGA1UEAxMRdWhyd2ViMDAuaS51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDF+vTxTJNexWcmMvX9p/xKo8k1yLnDiETWeKLv
+THs24Kw4eZVxm5fgwp/cFLWZ4JdYUSMJRgboHf+aocV9fkk8NVxR6bZi0BDQLsPw
+WUsCjSJ8qps49pIjbyojGYApOinsKjZ6R4cXypl5wJjDdUocQ44hRXfHwGp8YO3G
+N7oX50XZ7oVIwsrjg5MJ/D/S9l4LvNXmzUYmCoJblA0ys5TLza5Nbvk/lkYwzFeM
+jIbnjzhgQcEK7a6VNZuA77ox+/Spr4e09p51DYq84/UYgOoPBqilcH8yuFWoAlCj
+QPUxVXHUUUq0aRkGJzZrZVfJb8FN2KQrGj+aQDxsc6UR0irzAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXVocndlYjAwLmkudWhyLnNlMB0GA1UdDgQWBBR49xYx+FYEohIO
+UJ1wGDgen6owfzANBgkqhkiG9w0BAQUFAAOCAQEAw6jVA4MNMufsdS02fTsBuwv1
+XDPaH7zLR0UkOzDAxWpbMoB4r+bXvxawL02mcLciKa1qMczJI35UxxCZi4XW/78d
+Qyqz6IqAF5pbHDzIGij/jDysIwsPNzULawhr4nb46FZ0jRtlGU+nqlKpC0eNLvru
+0ntNd0B9Dx3/75Uj9Fc6BLjoHbrXFBZDQxCBTFebq9k2h2aEpR0GCiS7b1+NZpng
+lCQay1yDOXbbbFWmU8Ggn8BWJ3/4AdfiYs0U4sjkpel77MhH8qtdnH03dXPOOorE
+gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,6 +74,10 @@ E0nPNhmRfzH1Ynsjd36kgeDb7ZRmAvGiD5Ja3JsoTJxiV5RQXNzMZG7dUw8+7rSi
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
diff --git a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
index 071246d6..1e8b33fb 100644
--- a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
@@ -26,6 +26,7 @@ and do *NOT* provide it in real time to your partners.
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -35,7 +36,9 @@ and do *NOT* provide it in real time to your partners.
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Lärarlyftet Validering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lärarlyftet Validation</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Valideringssystemet för Lärarlyftet</mdui:Description>
+        <mdui:Description xml:lang="en">This service is the validation system for Lärarlyftet</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
index fdbc3e08..3f3aa54e 100644
--- a/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-utv1.ad.umu.se-shibboleth.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umdac-utv1.ad.umu.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://umdac-utv1.ad.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">QA-miljö för ServiceDesk</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">QA-environment for ServiceDesk</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">En samling av verktyg och tjänster för studenter och anställda vid Umeå universitet
+    </mdui:Description>
+        <mdui:Description xml:lang="en">A collection of tools and services for students and staff at Umeå University
+    </mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
index a016d6da..3837a02c 100644
--- a/swamid-2.0/verify.studentbeans.com-shibboleth.xml
+++ b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
@@ -23,6 +23,7 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml b/swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml
index 1a662e40..56b5956a 100644
--- a/swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml
+++ b/swamid-2.0/webapp-utv.ita.mdh.se-shibboleth.xml
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webapp-utv.ita.mdh.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webapp-utv.ita.mdh.se/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Utveckling av Studentportal MDH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Development of Student portal MDH</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Denna applikation används för att testregistrera sig på kurs på MDH.</mdui:Description>
+        <mdui:Description xml:lang="en">This service is used for test registering at course at MDH.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.mdh.se/student/service/studentportalen-1.260?l=sv_SE</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.mdh.se/student/service/studentportalen-1.260?l=en_UK</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.mdh.se/gemensamt/webbplatsen/juridisk-information-1.205?l=sv_SE</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.mdh.se/gemensamt/webbplatsen/juridisk-information-1.205?l=en_UK</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml b/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
index 61485bc7..50ca0a2e 100644
--- a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
@@ -23,6 +23,7 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
new file mode 100644
index 00000000..6e13ef8f
--- /dev/null
+++ b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="www.lararlyftet-validering.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Lärarlyftet Validering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lärarlyftet Validation</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Valideringssystemet för Lärarlyftet</mdui:Description>
+        <mdui:Description xml:lang="en">This service is the validation system for Lärarlyftet</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sto-pola.sto.netlight.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sto-pola.sto.netlight.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAM8E1VkC2/D7MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHN0by1wb2xhLnN0by5uZXRsaWdodC5zZTAeFw0xNDEyMTIxNDM3MzRaFw0y
+NDEyMDkxNDM3MzRaMCMxITAfBgNVBAMTGHN0by1wb2xhLnN0by5uZXRsaWdodC5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMe7IeD13RcALx46boeu
+Xqi1RI4czNsDBSt7O5CmYdI9V1SuVMLxX1pg/xqX2E7UquxmgOKDSk37ELzCvllI
+LiajuaTFJB2piIgOuty24TVVdPKu3d9MSONguAinoee3+EQVAAGv1PeqJddVKZR2
+WcWHm8+gaw30f031hPDxdkAmfH6aj9DYpAvR0X++uDBXCTzLSSs4EqBFCxce5pHN
+fWzft0k5M/eSozzu7SiS0GS/HbQoXRVwcW2LHayULlbeLMDfnybhm/nD9bgC1+y0
+QMDYmTnP6QFMKfrlnoSzJwdgexn6WlC1ot+EMWebt0h2LOsyAplAZW+xnX/yf+VV
+RM0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYc3RvLXBvbGEuc3RvLm5ldGxpZ2h0LnNl
+MB0GA1UdDgQWBBSBXAMCdz4oSN4hX5oOoKNTrFXt9TANBgkqhkiG9w0BAQUFAAOC
+AQEAfXL0K8J7WCSSzMN+3mC6dl2sou6zw8QNGfXRo41vB+kBqtLLI1VZZg1cWAf0
+yopwPtwz9KseMSJvoQgcW+UuSXJgTEQmrkD6hJJhcZZpFSqAt9cNfbrXY6m5YDHj
+WBGYLC1USzLHiC1LP73IbiATvEPi8r3jS1Vm/Sg82bkkxbSXMkN3GmxjvKpFZkZH
+Fpgh9wz7R/qlZTrKGWoBsIApiSNJB4BBMc8AaaF6v26IZy2FsFhXQjX7fHG5OpIZ
+ABP8HAePligOwIdfjCyp+kw/tvzVOE6mcGZUibXvNXBSnQoykuV8dPZe4yWzpbzg
+MViWUqDxKicGyuokDNf3hpcc9w==
+</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://www.lararlyftet-validering.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml b/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
index 2c694e38..0fce39d4 100644
--- a/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.servicedesk.its.umu.se-shibboleth.xml
@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.servicedesk.its.umu.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.servicedesk.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">ServiceDesk - IT-support vid Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ServiceDesk - IT-support at Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">En samling av verktyg och tjänster för studenter och anställda vid Umeå universitet</mdui:Description>
+        <mdui:Description xml:lang="en">A collection of tools and services for students and staff at Umeå University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 440a33c7..b956cc89 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -341,4 +341,6 @@
   <xi:include href="swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml"/>
   <xi:include href="swamid-2.0/verify.studentbeans.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.kau.se.xml"/>
+  <xi:include href="swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>