SWAMID-679: Ladok updates

24 files changed, 484 insertions, 576 deletions

diff --git a/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
index 737255df..43f08f32 100644
--- a/swamid-2.0/confluence.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
@@ -21,8 +21,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://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -31,6 +30,16 @@ and do *NOT* provide it in real time to your partners.
       <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://confluence.its.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://confluence.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
       <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://confluence.its.umu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">Confluence at ITS, Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Confluence at ITS, Umeå University</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Confluence vid ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Confluence vid ITS, Umeå universitet</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -78,5 +87,45 @@ iDg+++MxNlMn5A==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Confluence at ITS, Umeå University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Confluence vid ITS, Umeå universitet</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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml b/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
index 2a89a0ec..b3197227 100644
--- a/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
@@ -123,25 +123,25 @@ WdMLKixMaF7Vggu7L05EeKCLm2QR2qRNqg==
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml b/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
index 977b7b61..02af2610 100644
--- a/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
@@ -123,25 +123,25 @@ gL7Pmj+wCIaPgKIgLqqFDAc=
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml b/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
index 73cda6e8..e2b2b6e1 100644
--- a/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
+++ b/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
@@ -123,25 +123,25 @@ b0HRKIQRAuNjIz7n7r1L2sWQlssLXd3Tr7AGqwF72oQ/DTnkMvxdFgVeNfQDpSg=</ds:X509Certifi
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml b/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
index f4cc5c92..9287785a 100644
--- a/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
+++ b/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
@@ -105,25 +105,25 @@ aeTtz7U=</ds:X509Certificate>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index f5662abc..59ddbe79 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-00.ladok.umu.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:19:51Z">
       <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"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,31 +87,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index 066a5732..1194d037 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-00.ladok.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:19:52Z">
       <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"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</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:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,31 +86,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index b92b669f..2d79da43 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-02-20T12:56:05Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:19:53Z">
       <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"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,26 +87,35 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 7d1209a7..42e81dae 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-01.ladok.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:19:55Z">
       <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"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-01.ladok.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</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:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,26 +86,35 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
index ae742555..ce21b93a 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-00.its.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-14T15:58:46Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:19:40Z">
       <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"/>
@@ -49,25 +49,7 @@
         <ds:KeyName>ladok3-demo-00.its.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-demo-00.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJALY80u1Q5yYDMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2xhZG9rMy1kZW1vLTAwLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2MjVa
-Fw0yNDEwMDQxNDQ2MjVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAwLmxhZG9r
-LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMf+5VWM1++P
-Z37tYP+8v0JoV87NCIaz1f5Z3ZYObi5YFX5PVCCzy8+RjsZJ+Z4MJWVKosnaM6EB
-pWsrPJHZSlJeiZK+lzmRFTEP7MhPHHk/CDdEI5LvMxYFk1Py57tRfjtc+nJ6hlGv
-cyJLYoDqeqmO6sb7hLAivOcCV12K3Fic8pPGdhRROHejzGPXFUmjdK98/RXksH0l
-9s9j1fHN29hix/CoOlS1B5efv9eX7aHO1c82qMJYWIfVUQHSHP6ii0nBlHHvh+Jm
-QtVn+3XhwmL/aOj9dVFqcmshGOpQ3CTxov1FgalbRGcJ7Dt84d4XfkdPaN8/2UHO
-Arp456IX5jMCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMC5s
-YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDAubGFkb2sudW11LnNl
-L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFOUa/UFpjSk/gRQ3pRJmUtkB
-VdniMA0GCSqGSIb3DQEBBQUAA4IBAQDFdLt9wrrsSholwlAfFojbp5CRp6WPv5D3
-IdA0p1be43iNSDEORSIHrAEUuxgDJOvZLpDefQg5ZtmT+S3sxeO+KvUM0IHe78qE
-swfB9bvvQ6Ev331Sj/HVuOIGmIhcjxKA4B+FWTxvGxD7Loxeaoe0hKnlG2jJuFbt
-gu1TH91sschYabmEnRKqYl9M5UxssEtLL9X96h7k51FtEcT6U9jRR/4XvfbwvNE+
-AXW3m6StkVo5baFuUDWPAQ41e+EKBHmt6N8ONNl3DfoC2/owNiiGfmkuXFyOsJ7i
-xWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJALY80u1Q5yYDMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAwLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2MjVaFw0yNDEwMDQxNDQ2MjVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAwLmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMf+5VWM1++PZ37tYP+8v0JoV87NCIaz1f5Z3ZYObi5YFX5PVCCzy8+RjsZJ+Z4MJWVKosnaM6EBpWsrPJHZSlJeiZK+lzmRFTEP7MhPHHk/CDdEI5LvMxYFk1Py57tRfjtc+nJ6hlGvcyJLYoDqeqmO6sb7hLAivOcCV12K3Fic8pPGdhRROHejzGPXFUmjdK98/RXksH0l9s9j1fHN29hix/CoOlS1B5efv9eX7aHO1c82qMJYWIfVUQHSHP6ii0nBlHHvh+JmQtVn+3XhwmL/aOj9dVFqcmshGOpQ3CTxov1FgalbRGcJ7Dt84d4XfkdPaN8/2UHOArp456IX5jMCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMC5sYWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDAubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFOUa/UFpjSk/gRQ3pRJmUtkBVdniMA0GCSqGSIb3DQEBBQUAA4IBAQDFdLt9wrrsSholwlAfFojbp5CRp6WPv5D3IdA0p1be43iNSDEORSIHrAEUuxgDJOvZLpDefQg5ZtmT+S3sxeO+KvUM0IHe78qEswfB9bvvQ6Ev331Sj/HVuOIGmIhcjxKA4B+FWTxvGxD7Loxeaoe0hKnlG2jJuFbtgu1TH91sschYabmEnRKqYl9M5UxssEtLL9X96h7k51FtEcT6U9jRR/4XvfbwvNE+AXW3m6StkVo5baFuUDWPAQ41e+EKBHmt6N8ONNl3DfoC2/owNiiGfmkuXFyOsJ7ixWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -95,8 +77,8 @@ xWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-00.its.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
       <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
+      <md:ServiceName xml:lang="en">Ladok for students</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:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -104,34 +86,34 @@ xWDwb5aYklLO+9BLWcSBPuvhi/IL2zDSU2XY59ANCl168/3hv/V4
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
index 76dacf61..812c67dc 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
@@ -1,27 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-01.its.umu.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-02-20T12:56:05Z">
-      <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 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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://ladok3-demo-01.its.umu.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://ladok3-demo-01.its.umu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3‑demo‑01</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3‑demo‑01</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">Ladok för personal ladok3-demo-01.its.umu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for employees ladok3-demo-01.its.umu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="98" width="96">https://ladok3-demo-01.its.umu.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="98" width="96">https://ladok3-demo-01.its.umu.se/logo/ladok_en.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -30,27 +49,18 @@
         <ds:KeyName>ladok3-demo-01.its.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-demo-01.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOeH1y234BADMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGWxhZG9rMy1kZW1vLTAxLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODExWhcN
-MjIxMjA1MDcyODExWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMS5pdHMudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5w0tDtWTb1i7oEXr
-cmgSbQN2+INDlywnQRJXaGDyjypZ66LtKafw0E2g7WXCfYupkGGIf9UhpYY2tbMh
-d0yztJiKtvWTbEb8E8Z7D1kG5FuoXQkjmG2w/FKzSAFH0MLiGyfvr9oBab3F7yZQ
-zZ7t9XPc1RFe2qAYmu3iH383RmRb9fje/WXQVk4cMybqhCZTUoiHBWo9dZhwdxfL
-/UeN8BqIY+NwcmcaIdyPQKH2NGB5/3bJr0doap127tyokoyfLDo8meJnBc4zwSt4
-XCLFmC4g/1JsIe6T2RsieYtpVY0teWB+LH0emFTlyuhoNMM1bTtVfUk4mjq/R1B8
-mjxKhwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMS5pdHMudW11
-LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAxLml0cy51bXUuc2UvZ3VpLXNwMB0G
-A1UdDgQWBBQgFTqtvplztjIK/Tf1iTAdLHAEwzANBgkqhkiG9w0BAQUFAAOCAQEA
-OecNgHiP0PD31hbHg8QxsL6IHqpOIrvXRyj+U9gnG/S1ivj79y+lyO6HLrqsycOJ
-UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
-3wpgakdItEHPLbvx/v0x2aLvEgf7FrV9cYrv0HpVI+rZrETTDxWulmS1WE3jr4mm
-+Xbwm5CdJMFxtdHoADDUxbYpb7HMu8XLPN0/nVKEs/87xGCVQbHO8uRNQmeDAQhn
-0ev1AvjK9iWoPASSWa05+hcK6gULU5zjl0B4zuECMj9Q5k4Y/0rEcKN828D+JXHq
-9eyXLV8+BdsY6n7mcEsoOg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAOeH1y234BADMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWxhZG9rMy1kZW1vLTAxLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODExWhcNMjIxMjA1MDcyODExWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMS5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5w0tDtWTb1i7oEXrcmgSbQN2+INDlywnQRJXaGDyjypZ66LtKafw0E2g7WXCfYupkGGIf9UhpYY2tbMhd0yztJiKtvWTbEb8E8Z7D1kG5FuoXQkjmG2w/FKzSAFH0MLiGyfvr9oBab3F7yZQzZ7t9XPc1RFe2qAYmu3iH383RmRb9fje/WXQVk4cMybqhCZTUoiHBWo9dZhwdxfL/UeN8BqIY+NwcmcaIdyPQKH2NGB5/3bJr0doap127tyokoyfLDo8meJnBc4zwSt4XCLFmC4g/1JsIe6T2RsieYtpVY0teWB+LH0emFTlyuhoNMM1bTtVfUk4mjq/R1B8mjxKhwIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMS5pdHMudW11LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAxLml0cy51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBQgFTqtvplztjIK/Tf1iTAdLHAEwzANBgkqhkiG9w0BAQUFAAOCAQEAOecNgHiP0PD31hbHg8QxsL6IHqpOIrvXRyj+U9gnG/S1ivj79y+lyO6HLrqsycOJUiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw3wpgakdItEHPLbvx/v0x2aLvEgf7FrV9cYrv0HpVI+rZrETTDxWulmS1WE3jr4mm+Xbwm5CdJMFxtdHoADDUxbYpb7HMu8XLPN0/nVKEs/87xGCVQbHO8uRNQmeDAQhn0ev1AvjK9iWoPASSWa05+hcK6gULU5zjl0B4zuECMj9Q5k4Y/0rEcKN828D+JXHq9eyXLV8+BdsY6n7mcEsoOg==</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://ladok3-demo-01.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
@@ -66,5 +76,46 @@ UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-01.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
index 502f334d..d12a882d 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml
@@ -1,13 +1,6 @@
 <?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" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-01.its.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -24,11 +17,31 @@ 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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://ladok3-demo-01.its.umu.se:446/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://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+      <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://ladok3-demo-01.its.umu.se:442/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://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Ladok för studenter ladok3-demo-01.its.umu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for students ladok3-demo-01.its.umu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-demo-01.its.umu.se:442/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-demo-01.its.umu.se:442/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -36,25 +49,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>ladok3-demo-01.its.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-demo-01.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAMRYGhBhn5UuMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2xhZG9rMy1kZW1vLTAxLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2MzVa
-Fw0yNDEwMDQxNDQ2MzVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAxLmxhZG9r
-LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOalh/0b61hE
-OCTOh82ytTf3633I9ZrsKD1XGlCICIYNbgrqRwA/T2NqX6cnQh2hgTqlUUaVX7WZ
-q3VDCmi84v3RRoDC5mrP84vWejNzVMZKCwugp0KhnDQbWb1qzQnGTI5ezgjuXmIr
-qPlBPC0AaLTb+6jX9VRA+rJqiHuJATF+5fm1xwiJ5QR67DiVeHewcGP3r9Z3Fb5g
-KSmbd0GmkXZb4F10pmFGE7471ZTgcrL9soAaA8hlc2+jL1UVvtE7PY9VTcnD540Y
-koL9kIfnMWIO/x06fWJQkphfrQu41Rh4UMt9e5qcJcUA/knmw/OWPH2/svDhv0mO
-rip3BLBPe+MCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMS5s
-YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDEubGFkb2sudW11LnNl
-L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFLboAtPLn/yoa6dvPyfFZXlD
-PY9vMA0GCSqGSIb3DQEBBQUAA4IBAQBWwcRdfbwtKbNYHuI2mLxjoh2Zac/ns7BR
-uY/ZmbDJ/Yhk6vdiU0/jwP2TkIs0Z9/oXetVuQICtgRLdBBSBSNpUMsMqR+tJ6Ab
-etzXToph/gvyv8XNjahPtOOLvtK/874r5JuqfktFcsTjhxoxvEsRq+H6xUnitw77
-Iq/yhze6jvJn+5zRr/vkwpKJBLobXjytbvaahijlJxKgj+FBEkwUTotNnz5G4SsA
-pYOMqd8nZEwrLoOlQXb5MKRDS0cdjiDGh7RDvQgs05MTMHQI/C7pwoAm8XWEfZlP
-doapb4k+1TzJZ+MDX6jwvVMl0DN5+rmuHjkmu75L+UERnVJRSbIK
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAMRYGhBhn5UuMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAxLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2MzVaFw0yNDEwMDQxNDQ2MzVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAxLmxhZG9rLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOalh/0b61hEOCTOh82ytTf3633I9ZrsKD1XGlCICIYNbgrqRwA/T2NqX6cnQh2hgTqlUUaVX7WZq3VDCmi84v3RRoDC5mrP84vWejNzVMZKCwugp0KhnDQbWb1qzQnGTI5ezgjuXmIrqPlBPC0AaLTb+6jX9VRA+rJqiHuJATF+5fm1xwiJ5QR67DiVeHewcGP3r9Z3Fb5gKSmbd0GmkXZb4F10pmFGE7471ZTgcrL9soAaA8hlc2+jL1UVvtE7PY9VTcnD540YkoL9kIfnMWIO/x06fWJQkphfrQu41Rh4UMt9e5qcJcUA/knmw/OWPH2/svDhv0mOrip3BLBPe+MCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMS5sYWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDEubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFLboAtPLn/yoa6dvPyfFZXlDPY9vMA0GCSqGSIb3DQEBBQUAA4IBAQBWwcRdfbwtKbNYHuI2mLxjoh2Zac/ns7BRuY/ZmbDJ/Yhk6vdiU0/jwP2TkIs0Z9/oXetVuQICtgRLdBBSBSNpUMsMqR+tJ6AbetzXToph/gvyv8XNjahPtOOLvtK/874r5JuqfktFcsTjhxoxvEsRq+H6xUnitw77Iq/yhze6jvJn+5zRr/vkwpKJBLobXjytbvaahijlJxKgj+FBEkwUTotNnz5G4SsApYOMqd8nZEwrLoOlQXb5MKRDS0cdjiDGh7RDvQgs05MTMHQI/C7pwoAm8XWEfZlPdoapb4k+1TzJZ+MDX6jwvVMl0DN5+rmuHjkmu75L+UERnVJRSbIK</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -67,19 +62,59 @@ doapb4k+1TzJZ+MDX6jwvVMl0DN5+rmuHjkmu75L+UERnVJRSbIK
       <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://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-01.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-01.its.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
index dfc47985..8ac5caf2 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
@@ -1,20 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-02.its.umu.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-02-20T12:56:05Z">
+    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://ladok3-demo-02.its.umu.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://ladok3-demo-02.its.umu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3‑demo‑02</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3‑demo‑02</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3 är nästa generation av studieadministrativt systemstöd för universitet och högskolor i Sverige</mdui:Description>
-        <mdui:Description xml:lang="en">Ladok3 is the next generation of the administration system for higher education in Sweden.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">Ladok för personal ladok3-demo-02.its.umu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for employees ladok3-demo-02.its.umu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-demo-02.its.umu.se/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-demo-02.its.umu.se/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -23,27 +49,18 @@
         <ds:KeyName>ladok3-demo-02.its.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-demo-02.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAInGoLqyk3C+MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGWxhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODEyWhcN
-MjIxMjA1MDcyODEyWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMi5pdHMudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+xisO1AornoaWz46
-IAUSjOCPXp4NV3cGU01VsvXe7FhZGByScd01L53WkhvWWLCGKTxZNAS2dyAbDhEO
-5X9TMPtpHE9XCcyqd8yii3g7nScj5/S/YudZOnZvuCDlH2hg2YhCGZRujUA0e7JM
-otEm/Lz18AecsECQsbNd/95oYl6/k4TMPg8dT32rbHQl6hGPfH+IK1Z7OMnXYsP+
-sMBgaSMfQna8zaijQo0aM9/zyp3wxeTsncS5l74eYm3whaKHxRsTjvUh/YaI9LTU
-wrPxuwZINtQ7HiZ/3KwoREl22zsntUemTmdWez85ctYMdtEc5h+3UVNfd1P7UNcW
-c+oZzQIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMi5pdHMudW11
-LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UvZ3VpLXNwMB0G
-A1UdDgQWBBRahNxHA0sPHkTEvPxjZ+V6K2tTQTANBgkqhkiG9w0BAQUFAAOCAQEA
-tUgKur8E4TfES+5QbUJpKABDRJUiPmxrlUAaU+B2BZA74+tO717esA44Jahlre/v
-CV5grAoeplD6llBeMUe7hVsMum63kUpUh+zLwiP/KSegjxrYMv9vueqpCB2bYzy4
-4Kv9GchQaA+XvdX7pBhQdQchEmexlkoyLk52pIG5kPos5FoKUnE1avcydLDn5IXF
-FtfOLxpCpBkLZT1JtloPydKvbueD28Kpq/BynPMijzH/Y5mTpy81h5MY+HoOWmus
-zhFBTc7cydJB7Uvj9A5mgA9DtxsnmBxwRv/VwpXGmXGTm/Lrh4o61MI/yI84/UEa
-a/lggwDHd7eCy/34Rs5nJw==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIJAInGoLqyk3C+MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWxhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UwHhcNMTIxMjA3MDcyODEyWhcNMjIxMjA1MDcyODEyWjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMi5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+xisO1AornoaWz46IAUSjOCPXp4NV3cGU01VsvXe7FhZGByScd01L53WkhvWWLCGKTxZNAS2dyAbDhEO5X9TMPtpHE9XCcyqd8yii3g7nScj5/S/YudZOnZvuCDlH2hg2YhCGZRujUA0e7JMotEm/Lz18AecsECQsbNd/95oYl6/k4TMPg8dT32rbHQl6hGPfH+IK1Z7OMnXYsP+sMBgaSMfQna8zaijQo0aM9/zyp3wxeTsncS5l74eYm3whaKHxRsTjvUh/YaI9LTUwrPxuwZINtQ7HiZ/3KwoREl22zsntUemTmdWez85ctYMdtEc5h+3UVNfd1P7UNcWc+oZzQIDAQABo3EwbzBOBgNVHREERzBFghlsYWRvazMtZGVtby0wMi5pdHMudW11LnNlhihodHRwczovL2xhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBRahNxHA0sPHkTEvPxjZ+V6K2tTQTANBgkqhkiG9w0BAQUFAAOCAQEAtUgKur8E4TfES+5QbUJpKABDRJUiPmxrlUAaU+B2BZA74+tO717esA44Jahlre/vCV5grAoeplD6llBeMUe7hVsMum63kUpUh+zLwiP/KSegjxrYMv9vueqpCB2bYzy44Kv9GchQaA+XvdX7pBhQdQchEmexlkoyLk52pIG5kPos5FoKUnE1avcydLDn5IXFFtfOLxpCpBkLZT1JtloPydKvbueD28Kpq/BynPMijzH/Y5mTpy81h5MY+HoOWmuszhFBTc7cydJB7Uvj9A5mgA9DtxsnmBxwRv/VwpXGmXGTm/Lrh4o61MI/yI84/UEaa/lggwDHd7eCy/34Rs5nJw==</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://ladok3-demo-02.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
@@ -59,5 +76,46 @@ a/lggwDHd7eCy/34Rs5nJw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-02.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok for employees</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
index 8a15c071..16581fd4 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-student-sp.xml
@@ -1,13 +1,6 @@
 <?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" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-demo-02.its.umu.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-28T11:23:28Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
@@ -24,11 +17,31 @@ 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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-02T15:15:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://ladok3-demo-02.its.umu.se:446/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://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+      <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://ladok3-demo-02.its.umu.se:442/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://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Ladok för studenter ladok3-demo-02.its.umu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok for students ladok3-demo-02.its.umu.se</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok är en central tjänst för studieadministration riktad till studenter och studieadministrativ personal på universitet och högskolor i Sverige.</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok is a central service for study administration aimed at students and study administrative staff at higher education institutions in Sweden.</mdui:Description>
+        <mdui:Logo xml:lang="sv" width="96" height="98">https://ladok3-demo-02.its.umu.se:442/logo/ladok_sv.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="96" height="98">https://ladok3-demo-02.its.umu.se:442/logo/ladok_en.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -36,25 +49,7 @@ and do *NOT* provide it in real time to your partners.
         <ds:KeyName>ladok3-demo-02.its.umu.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=ladok3-demo-02.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAMVbo/yQV7JWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGWxhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UwHhcNMTQxMDEwMDkzNTI0WhcN
-MjQxMDA3MDkzNTI0WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMi5pdHMudW11
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Nuc1eTRGUFZON4w
-X3uokaEyJUcjGB82f9XWIUcraOVREAhLUQm/FPkOQQO2+WslwAe0otbqMTLFVKL0
-XdI+O0rqp2sgX3YdIepLUz03Lh/jbWFqm3ZWnIrNozaTNdedVlqMaQZHNDq8aHYx
-d6AgV+js4lIjbZUY3NHHISwE6ghxMtfg/0Ok6U0/KN6YbUpALV0hoGTYVIep2Y4/
-QPL8oPYLf2n4x2yLh9+c0GQ/OIPzcrZv0q5Ik18UkVQs7Ki4DOtjkPRm3/tthnQk
-nnwla9UMnDeceYECTj6qMSflhaVWpVLbGOS3Jp4fQOEo7DPwERjEOq4Uf6RgIySn
-pcMNCQIDAQABo34wfDBbBgNVHREEVDBSghlsYWRvazMtZGVtby0wMi5pdHMudW11
-LnNlhjVodHRwczovL2xhZG9rMy1kZW1vLTAyLml0cy51bXUuc2Uvc3R1ZGVudC1m
-cm9udGVuZC1zcDAdBgNVHQ4EFgQUbOXVTx2U4lRY/yJvTr77t5M06I4wDQYJKoZI
-hvcNAQEFBQADggEBAKycVqpsgiW3IwW4DvBieorz3sa3qsgVckznLuUbZIXXpEHu
-JhFXdDYxxQwFfJThbTf57g6FxkLi2RYi5Cd3ZSZlK0/oGEnJ6yFcJ0Ip8TcJEEuL
-A9io/dCrUcOt7PBv4tlx32u0pdpPaNpQPYni4viv4FRJJnyM9ftsm2j8Bdj5GgUL
-nEutH0uEcWAlsF0OwRz2eRMJwe0Y2fnFnu7uGEOlXrpwGChin8UiuXt3cRLUJjR+
-/B8xPec4+f1VkwfZpnonDIv7B8ukpCIwv92sdYhFdrcMiA8ubD+nicffPhE7KDSE
-sfAksU5zX5TLN6UmXQeW0u0pLpk4YCOXJJ5mX6E=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIJAMVbo/yQV7JWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNVBAMTGWxhZG9rMy1kZW1vLTAyLml0cy51bXUuc2UwHhcNMTQxMDEwMDkzNTI0WhcNMjQxMDA3MDkzNTI0WjAkMSIwIAYDVQQDExlsYWRvazMtZGVtby0wMi5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Nuc1eTRGUFZON4wX3uokaEyJUcjGB82f9XWIUcraOVREAhLUQm/FPkOQQO2+WslwAe0otbqMTLFVKL0XdI+O0rqp2sgX3YdIepLUz03Lh/jbWFqm3ZWnIrNozaTNdedVlqMaQZHNDq8aHYxd6AgV+js4lIjbZUY3NHHISwE6ghxMtfg/0Ok6U0/KN6YbUpALV0hoGTYVIep2Y4/QPL8oPYLf2n4x2yLh9+c0GQ/OIPzcrZv0q5Ik18UkVQs7Ki4DOtjkPRm3/tthnQknnwla9UMnDeceYECTj6qMSflhaVWpVLbGOS3Jp4fQOEo7DPwERjEOq4Uf6RgIySnpcMNCQIDAQABo34wfDBbBgNVHREEVDBSghlsYWRvazMtZGVtby0wMi5pdHMudW11LnNlhjVodHRwczovL2xhZG9rMy1kZW1vLTAyLml0cy51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUbOXVTx2U4lRY/yJvTr77t5M06I4wDQYJKoZIhvcNAQEFBQADggEBAKycVqpsgiW3IwW4DvBieorz3sa3qsgVckznLuUbZIXXpEHuJhFXdDYxxQwFfJThbTf57g6FxkLi2RYi5Cd3ZSZlK0/oGEnJ6yFcJ0Ip8TcJEEuLA9io/dCrUcOt7PBv4tlx32u0pdpPaNpQPYni4viv4FRJJnyM9ftsm2j8Bdj5GgULnEutH0uEcWAlsF0OwRz2eRMJwe0Y2fnFnu7uGEOlXrpwGChin8UiuXt3cRLUJjR+/B8xPec4+f1VkwfZpnonDIv7B8ukpCIwv92sdYhFdrcMiA8ubD+nicffPhE7KDSEsfAksU5zX5TLN6UmXQeW0u0pLpk4YCOXJJ5mX6E=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -67,19 +62,59 @@ sfAksU5zX5TLN6UmXQeW0u0pLpk4YCOXJJ5mX6E=
       <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://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-02.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-demo-02.its.umu.se:442/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Ladok for students</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:GivenName>Ladok-supporten</md:GivenName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml b/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
deleted file mode 100644
index de702406..00000000
--- a/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-idp.its.umu.se/proxy-sp/metadata.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <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://ladok3-idp.its.umu.se/proxy-sp/disco" index="1"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Proxy-IdP for login during Ladok development</mdui:Description>
-        <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks utvecklingsmiljöer</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Ladok development proxy-IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Ladok utveckling proxy-IdP</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFTzCCAzegAwIBAgIUVuK4rFRJib8oVJEeGbjWbECzr68wDQYJKoZIhvcNAQEL
-BQAwNzEVMBMGA1UECgwMcHJveHktaWRwIHNwMR4wHAYDVQQDDBVsYWRvazMtaWRw
-Lml0cy51bXUuc2UwHhcNMjExMDA2MTMzNzExWhcNMzExMDA0MTMzNzExWjA3MRUw
-EwYDVQQKDAxwcm94eS1pZHAgc3AxHjAcBgNVBAMMFWxhZG9rMy1pZHAuaXRzLnVt
-dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALnNVK3f2/C3K1D9
-gaf8wRMl3V3TQAAjVxaRY899BvfkrHQcqtxBWHSTTx0I4ahcgJazHl8tH48ZxGAI
-qHkpX5XXQuSrgU99UlpLTJ7flueA4ugDIxki3haQ/xLNoEeQ9p15PhZlxZfQ4HB0
-bXvKNhX+098sybXiY/6z9fG1YQfC0GzGq1HgPpkM0rgNpCIb+q+hwmLZJCxdtUyg
-yzhz4eADl0ObpMsDN5wGS58nkefCZAKVRhd9pTmjoTNXioPS6VanX1LxUNsA0jYQ
-9K5bFMfcPgcPCOgsMBIctEUmbHlEzYbrQBcfhpU3Hz44suzmYkCMhy9lXb0LtLGI
-NJ7GTFpKe2AfEf33WwXEL2k9lK/XJXxjShjL61kiPnB22mLMYQ8K0Wb5hSs1FJiI
-NkL9MLuA8uaJ5nCDqGkc/zVxqEnTQY8bbaf+fdfcZ5oYvjEguFR8LA6QasITflr4
-xp5M1ASFvYxlE+epjvgqWq3cghg3s7lnUp412DyxKs49oKJvU8mcxul/YH3h7HWZ
-BIqupYZgBctRBsNXucvZCgNb6799J/oDTVs3hU73JzEapVQpmZ1cspYhGBzFB5HJ
-h27fjqS1Bt0A5TbJNU0g/lIqGO/jO5T5fIl7+zDCc7ShkZ58i6wvzhtOtHgik1GW
-d6x1Cj8oSN1jUQrK9SsNr5flci1dAgMBAAGjUzBRMB0GA1UdDgQWBBSX29HzY5Bk
-FtVyUe9zkNgTGe0RwDAfBgNVHSMEGDAWgBSX29HzY5BkFtVyUe9zkNgTGe0RwDAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQANdUmGZckUm76BG8U6
-hpyr96mZGp15NbeY2WCfl7+KTcDQBerCGaoWQrSAtNRph9qjVUghlqaUaIpJjIpY
-AVVBcgIiWp3zVomSWmwPhPMvPr9Fwn86cwmjxj45tcFY7uY8oLZ1LdyrdRS8KdmM
-2FYIi0PAHkhW33mr8k/0myGFFJh/i/LMJj1egbvK86njnbY7cu84TVvVdYHD2dQI
-Y4AnRtK5M1XRZzy8NIskff+vdNMu9zYgaaDje/NSzyG1a+3BZM39E9r9jzkD6ed5
-W5VDDvlfGoGYt3zSxuDHywLiOmtS5cJ27L6rPmKPoYLb25AEW34GtTRVS5rQrLEI
-BvRzilStJaLc5TfSGmb3/v0gR1d60/ccCnE0zoJ+Z2gamuSnVW0yaIVLw11povZ4
-FuEawb2DoJL1q6bIJ34mcpubhG+aNgHx5dNxUFzMT4T7qL/1Zc63tZ7DWUSLhwxt
-eflOP3vbFaBbVKU5QpPgC+HDbfF5xEQh9Mk+b332rqwjXV9ITu6ZL4gtL2SRYLre
-c4U5J1bFWjUIqC0rWDBpgBIY6u51LDyAu0z+Vw3b0uemmdFRbIcW+1xr2htlq9Zy
-WQ9CV60rjXqqbIVogqaeJkMk/mhzrz7f6VquRyFaYd9eX1UkNt0kZUFyBMcLjcvn
-inTy+LsdM4MFwpiV7d4EZi89Aw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFTzCCAzegAwIBAgIUVuK4rFRJib8oVJEeGbjWbECzr68wDQYJKoZIhvcNAQEL
-BQAwNzEVMBMGA1UECgwMcHJveHktaWRwIHNwMR4wHAYDVQQDDBVsYWRvazMtaWRw
-Lml0cy51bXUuc2UwHhcNMjExMDA2MTMzNzExWhcNMzExMDA0MTMzNzExWjA3MRUw
-EwYDVQQKDAxwcm94eS1pZHAgc3AxHjAcBgNVBAMMFWxhZG9rMy1pZHAuaXRzLnVt
-dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALnNVK3f2/C3K1D9
-gaf8wRMl3V3TQAAjVxaRY899BvfkrHQcqtxBWHSTTx0I4ahcgJazHl8tH48ZxGAI
-qHkpX5XXQuSrgU99UlpLTJ7flueA4ugDIxki3haQ/xLNoEeQ9p15PhZlxZfQ4HB0
-bXvKNhX+098sybXiY/6z9fG1YQfC0GzGq1HgPpkM0rgNpCIb+q+hwmLZJCxdtUyg
-yzhz4eADl0ObpMsDN5wGS58nkefCZAKVRhd9pTmjoTNXioPS6VanX1LxUNsA0jYQ
-9K5bFMfcPgcPCOgsMBIctEUmbHlEzYbrQBcfhpU3Hz44suzmYkCMhy9lXb0LtLGI
-NJ7GTFpKe2AfEf33WwXEL2k9lK/XJXxjShjL61kiPnB22mLMYQ8K0Wb5hSs1FJiI
-NkL9MLuA8uaJ5nCDqGkc/zVxqEnTQY8bbaf+fdfcZ5oYvjEguFR8LA6QasITflr4
-xp5M1ASFvYxlE+epjvgqWq3cghg3s7lnUp412DyxKs49oKJvU8mcxul/YH3h7HWZ
-BIqupYZgBctRBsNXucvZCgNb6799J/oDTVs3hU73JzEapVQpmZ1cspYhGBzFB5HJ
-h27fjqS1Bt0A5TbJNU0g/lIqGO/jO5T5fIl7+zDCc7ShkZ58i6wvzhtOtHgik1GW
-d6x1Cj8oSN1jUQrK9SsNr5flci1dAgMBAAGjUzBRMB0GA1UdDgQWBBSX29HzY5Bk
-FtVyUe9zkNgTGe0RwDAfBgNVHSMEGDAWgBSX29HzY5BkFtVyUe9zkNgTGe0RwDAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQANdUmGZckUm76BG8U6
-hpyr96mZGp15NbeY2WCfl7+KTcDQBerCGaoWQrSAtNRph9qjVUghlqaUaIpJjIpY
-AVVBcgIiWp3zVomSWmwPhPMvPr9Fwn86cwmjxj45tcFY7uY8oLZ1LdyrdRS8KdmM
-2FYIi0PAHkhW33mr8k/0myGFFJh/i/LMJj1egbvK86njnbY7cu84TVvVdYHD2dQI
-Y4AnRtK5M1XRZzy8NIskff+vdNMu9zYgaaDje/NSzyG1a+3BZM39E9r9jzkD6ed5
-W5VDDvlfGoGYt3zSxuDHywLiOmtS5cJ27L6rPmKPoYLb25AEW34GtTRVS5rQrLEI
-BvRzilStJaLc5TfSGmb3/v0gR1d60/ccCnE0zoJ+Z2gamuSnVW0yaIVLw11povZ4
-FuEawb2DoJL1q6bIJ34mcpubhG+aNgHx5dNxUFzMT4T7qL/1Zc63tZ7DWUSLhwxt
-eflOP3vbFaBbVKU5QpPgC+HDbfF5xEQh9Mk+b332rqwjXV9ITu6ZL4gtL2SRYLre
-c4U5J1bFWjUIqC0rWDBpgBIY6u51LDyAu0z+Vw3b0uemmdFRbIcW+1xr2htlq9Zy
-WQ9CV60rjXqqbIVogqaeJkMk/mhzrz7f6VquRyFaYd9eX1UkNt0kZUFyBMcLjcvn
-inTy+LsdM4MFwpiV7d4EZi89Aw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <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" Location="https://ladok3-idp.its.umu.se/proxy-sp/acs/post" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Ladok development proxy-IdP</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Ladok utveckling proxy-IdP</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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml b/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
index 80ea63ee..b2ccf365 100644
--- a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
+++ b/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
@@ -111,25 +111,25 @@ unedWltx</ds:X509Certificate>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml b/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
index cd85cfdc..a49442f3 100644
--- a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
+++ b/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
@@ -109,25 +109,25 @@ AWJszdmP9pFByUcRfp1aOrpdIb0eLkHL5uzGdw==</ds:X509Certificate>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 5eb88e2b..68d61db0 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -113,25 +113,25 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml b/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
index e5ce8daf..ffaf2674 100644
--- a/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.ladoktest00.utv.ladok.se/student-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-02T13:19:40Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:19:58Z">
       <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"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för studenter</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for students</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:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -85,31 +86,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/student.ladoktest13.utv.ladok.se-student-sp.xml b/swamid-2.0/student.ladoktest13.utv.ladok.se-student-sp.xml
deleted file mode 100644
index 161843e1..00000000
--- a/swamid-2.0/student.ladoktest13.utv.ladok.se-student-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://student.ladoktest13.utv.ladok.se/student-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-06-17T13:22:49Z">
-      <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 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://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://student.ladoktest13.utv.ladok.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://student.ladoktest13.utv.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok studentgränssnitt student.ladoktest13.utv.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student web student.ladoktest13.utv.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://student.ladoktest13.utv.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://student.ladoktest13.utv.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://student.ladoktest13.utv.ladok.se/student-sp</ds:KeyName>
-        <ds:KeyName>student.ladoktest13.utv.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.ladoktest13.utv.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDXjCCAkagAwIBAgIJAO+r5jMv9dc5MA0GCSqGSIb3DQEBCwUAMCsxKTAnBgNVBAMMIHN0dWRlbnQubGFkb2t0ZXN0MTMudXR2LmxhZG9rLnNlMB4XDTE5MDQwODExMDg0MFoXDTI5MDQwNTExMDg0MFowKzEpMCcGA1UEAwwgc3R1ZGVudC5sYWRva3Rlc3QxMy51dHYubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCMVxFuyJFc2jntIKGLtiiSL7fF9+hqCHgylyMIIP0OctFIlowZ4B5aERg0SZ6dbPHT2w3hCioGk22NFZRI134ncNq5+oxg5mpqWjNnkD4eFbtwYUw57ucTvN1yq6iGtkESs8VvrQuJZ+HC3MtZKL0LrXznfOVjA4CMjVYAZmtBGEgU4m+2jmcIq3+Z0DWJ0X60r8vzzhs5CJkOxOyHw4yM74xM6xTwmRhBeODekGKRoFnJvqkE0Pu4DZK1AoW6ArSp0LutdwDn+GgxNUb13rgPnO9rmP2bAqrYLxUvhDbdXONTcyhgTqOlGMFcacbozTMBIoMF4RAF/vlzQsbfi2DAgMBAAGjgYQwgYEwYAYDVR0RBFkwV4Igc3R1ZGVudC5sYWRva3Rlc3QxMy51dHYubGFkb2suc2WGM2h0dHBzOi8vc3R1ZGVudC5sYWRva3Rlc3QxMy51dHYubGFkb2suc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQUHuJzuvcAC7Wnsq16h/Cd269Bc/EwDQYJKoZIhvcNAQELBQADggEBAAFSSi1C3Qsf2PZZLyXr49JDvegdicO1+SdCEI3ljZggSTD4MH/4M+WqKqXUdaW2FDLp8BwRQE0lZmedQEg1wnnlIdeFSeATu/HJJc6DEFofSNGQBi+mnBeV7FK6tCrYHzL4UcVJeevzQFQkKKMGSEG2hQmOyVq9NXd/Pa0HCLZCbaGHlqKV2XOLyaFGDnHuo1lttHtCiw8Mulsj7YLqYk8jXBr9F0dXTQeB7r825JG4LTiuXC64eG3Uhs8jEAoLaIoR+IKeph85Sdkn9C7ZyUv3rc93nPj0dN1tGyO8ePWWVf1XjB6JXe8irvGCAAqblJVam0N4dxhxxyY6vj348m4=</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://student.ladoktest13.utv.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml b/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
index 16ec5052..d1469f86 100644
--- a/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
@@ -123,25 +123,25 @@ yPoIQ1Flc8ORgIcmUzQYhlzEF4PxMZgnag==
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml b/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
index 3d41dc59..6bf33551 100644
--- a/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.ladoktest00.utv.ladok.se/gui-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-02T13:19:40Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-03T11:20:00Z">
       <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"/>
@@ -77,6 +77,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ladoktest00.utv.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Ladok för personal</md:ServiceName>
       <md:ServiceName xml:lang="en">Ladok for employees</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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -86,31 +87,34 @@
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium </md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
+    <md:GivenName>Ladok-supporten</md:GivenName>
     <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
diff --git a/swamid-2.0/www.ladoktest13.utv.ladok.se-gui-sp.xml b/swamid-2.0/www.ladoktest13.utv.ladok.se-gui-sp.xml
deleted file mode 100644
index e6032d34..00000000
--- a/swamid-2.0/www.ladoktest13.utv.ladok.se-gui-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://www.ladoktest13.utv.ladok.se/gui-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-06-17T13:22:49Z">
-      <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 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: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.ladoktest13.utv.ladok.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://www.ladoktest13.utv.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Ladok www.ladoktest13.utv.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok www.ladoktest13.utv.ladok.se</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
-        <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
-        <mdui:Logo xml:lang="sv" width="96" height="98">https://www.ladoktest13.utv.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="96" height="98">https://www.ladoktest13.utv.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://www.ladok.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ladok.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>https://www.ladoktest13.utv.ladok.se/gui-sp</ds:KeyName>
-        <ds:KeyName>www.ladoktest13.utv.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ladoktest13.utv.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJtfVi4pzclCMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNVBAMMHHd3dy5sYWRva3Rlc3QxMy51dHYubGFkb2suc2UwHhcNMTkwNDA4MTEwODM5WhcNMjkwNDA1MTEwODM5WjAnMSUwIwYDVQQDDBx3d3cubGFkb2t0ZXN0MTMudXR2LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmMc1Hu0Z1CeeggI7ujdn4QwJvs2C2FEIIJyiNuTZFWZ3g9itnqrAAivK7ByDEqovYEqHUJYVx9nNwThe22wTMlqFaz9kPhlCGlzKmqzy8DTwRdFTQ+C6xQP1vct7HxBGQo2NEhC/BUJB/1tdhyhPLLnhWqWQkLc/pkZoLPCuEy9PFRLlyfcGst3c2MT4JCjAYKPPjglkJV8UOT2qnssxitTFYk9p6Wk8syAS5o7/KgXKIz2UxV87d15BCQQtQ0/wNeWXJelY31L2N8W9nqcfMUxF6YA0lK3lsaa/p8PV6zGOcBpX67vhXsz/KSZZR9ZlVyb7PegJXdIz7A7BTh9+OwIDAQABo3cwdTBUBgNVHREETTBLghx3d3cubGFkb2t0ZXN0MTMudXR2LmxhZG9rLnNlhitodHRwczovL3d3dy5sYWRva3Rlc3QxMy51dHYubGFkb2suc2UvZ3VpLXNwMB0GA1UdDgQWBBSTwg4Q6pqVnNrvi9miqhI3QCKpqjANBgkqhkiG9w0BAQsFAAOCAQEAKYmVHOgGFrh58EKVf772mT/MT69giIpaDbxQg257iXtCRSkxSmx6yQdh5md1Z172xp9tf+FroxZUq+hDPyKYTq0DwFlwx9ZvsV4cKjIq3MLJ5r1wRAPdAm3uMLGF+K5l98ULopXltXdE5VSOzdE7RYPIJ0OJSC6rbaY1JMOKxTv2PK89cwav0nohWeVCy+4xHRTMEYjhtwCRLyvJEEo9rKMXpm5xUqEh2z6jau3CMaYWaOdOI0ZASGcV7DG9xzx0v5bFD3CMtwGsHwapOv7cOPCbHtF89rfMLq7Fd2rXTyuISbV+VHQ7QitYPNJHI0xNVPusla7wFtOrLb7ciY+Shg==</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.ladoktest13.utv.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ladoktest13.utv.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Fredrik Domeij</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>ITS, Umeå universitet</md:Company>
-    <md:SurName>Ladok-supporten</md:SurName>
-    <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 99cfdee4..5250b125 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -549,8 +549,6 @@
   <xi:include href="swamid-2.0/lis.ladok.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/myaccount.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/errorurl-sp-demo.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/student.ladoktest13.utv.ladok.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/www.ladoktest13.utv.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/weos406t.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lis.test.ladok.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml"/>
@@ -643,7 +641,6 @@
   <xi:include href="swamid-2.0/visp.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/stage.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tse-uu.sitevision.se.xml"/>
-  <xi:include href="swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/rehab.test.uu.se-ticketserver-.xml"/>