contact persons added for ladok3 devel sites

ladok3.its.umu.se-shibboleth.xml added obsolete ladok3 sites removed
author: Fredrik Domeij <fredrik.domeij@umu.se> 2017-02-28 09:03:13 +0100
committer: Fredrik Domeij <fredrik.domeij@umu.se> 2017-02-28 09:03:13 +0100
commit: e2ab4f74c50ae2e555871eea08e792bedcc5f497 (patch)
tree: 48074a8fd61c1380e654f8d7a1969c8d81fe4dcf /swamid-2.0
parent: 75b8cf92a880f7264670094edaa1508fc8007ffd (diff)
135 files changed, 3340 insertions, 2920 deletions
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 5f58b83e..5ea970c6 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
@@ -92,4 +92,19 @@ w5aKug==
     <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:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
index 76453faa..f5464b93 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
@@ -192,4 +192,19 @@ QfQy1lyrNjxrtHbS9ZGNpgVlaNvNHWF4ENGIAuxBLO2IZ6TgLGdNtB0Cn3c+Xdti
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
+  <ContactPerson contactType="administrative">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
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 456ddde0..d406ef79 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
@@ -93,4 +93,19 @@ Xtg7VBxaqt1Fm/Me7/+LxiQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.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-00.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
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 eaa47e0e..1242cba0 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
@@ -92,4 +92,19 @@ p012eg==
     <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:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </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 2b0cf5d4..8d350d87 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
@@ -93,4 +93,19 @@ Fgjs4zg7hkT8XjhWJeHVZjI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-01.ladok.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-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
index 565b1ecd..15018ee0 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ BeVqTg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-02.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-02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml
index 584d1de6..933bd226 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-02.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ V2U1emX7Cc8OvH12y7nKZu0=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-02.ladok.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-02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
index 62068573..a45c7c24 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ OqxKbw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-03.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-03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml
index bfb5639f..78ddae65 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-03.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ IlstWICQczAoX1y5Ow2IOEo=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-03.ladok.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-03.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
index fdcfefdd..c8f83c3e 100644
--- a/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ AMLCoA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-04.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-04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 166862b0..00000000
--- a/swamid-2.0/ladok3-04.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-04.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-04.ladok.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-04.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;04</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;04</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-04.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAL3TXy/wwu+RMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNC5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTM0MzE0WhcNMjQx
-MDA0MTM0MzE0WjAhMR8wHQYDVQQDExZsYWRvazMtMDQubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH1KJxI0E4cqpUL1IkUo8d85
-7ApTkh9nye8PEwXbhDKPa7hc0n+Kx3S47TxMoBqurFeXizCcH0sbpMr1z+HozfgE
-ENm3RlVjiGQ0wtHYbYv+cdw7rmnf09l1OtG1qqpbeAKyouKd8s0BU6lC3lvRCKmi
-JX+1VX1/YOts3FFlmrs/Pcl035joPzPJIFIIJpr2KPMItqOJLuyQkPohKKM3j8js
-1jicg6MrKWWaVd0BNAUacAUN991KjVW05Q3+QWVgNfhTifTHLcS7Bl0V5TujRTPR
-g4UvFm1y5a18Q5/97aB9IirlZVAAhGnrQlLcSy3Uap0UhM/T1nD5OVn/5797BwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDQubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wNC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUPPx6zb2rYA7RRQos62PossCqg10wDQYJKoZIhvcNAQEFBQADggEB
-AETFnez41ZpCRZN2iCR1m7X2EK6qWOdiqB2VtAVyxmLHwUk0Odj6/56T2S7+EDCW
-fNhDVQ05fUcKCzK1dhW9l8kdLAMMK8/didPsqwOkv6vOdcPd1qOEiJcjViLkxZGz
-IvmTagde6ULzGzcMsuADFudN3YvVFr6CLmurYT33R1r0NNFxr8+d2RgwvfwvFRYw
-RqJJ+t3s5iLH4GJCSdH73Vwv0uf1xXlCJe6VTC9oYBFxZU3/gQY8/KwZgwqw5+bc
-MC2cthlcSY/kqOuqomLXDUSf/O098apNa7DKrLHOdnOsaDZBqT07RDutNo/d97o6
-Nl/wC4jydXm9h5ZdZLZm55Q=
-</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-04.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-04.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-04.ladok.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-04.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-04.ladok.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-04.ladok.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-04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml
index bd2aa264..abe46faa 100644
--- a/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-04.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ Nl/wC4jydXm9h5ZdZLZm55Q=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-04.ladok.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-04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
index 7b312fcb..a33bb5ce 100644
--- a/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ Ij/QYw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-05.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-05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index f7f3076a..00000000
--- a/swamid-2.0/ladok3-05.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-05.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-05.ladok.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-05.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;05</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;05</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-05.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-05.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAOtHsdcqv/rDMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNS5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQzOTM2WhcNMjQx
-MDA0MTQzOTM2WjAhMR8wHQYDVQQDExZsYWRvazMtMDUubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8+pPNqjRUNAPWYZ0S8+nNEem
-OzveLIubT9EsqBx6xV8mWv3th3Uk/Vi8AGQhsaKH83yNUQYnaBHEPwyBexeqTRPl
-eQd0d660dheQacDxOHrp8z8QMkCCXAXA/xsnJ0+P2W8A0sbyAn6dAEH3cQNnCH+W
-9gDdHOrgztt8uLeIjGkUFpU0oeL5sHh9LWShcMT1lSnbEAQ97ArN60hFHzFVpebJ
-ABiY+2jHo+74yOrpU6sE0WWpPAFKQhDEDNNOMeaSrV/cOxp+q7U2x2mTU8F1pWVT
-Vg2zzgyv3OW0U+ohb5DGTWEA5M0h6flIP2iZzhlZeeppkPFPxPyeBkLm1aAdyQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDUubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wNS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQU8ZmWu90VLpnQ9ljpSueBe5a1WpkwDQYJKoZIhvcNAQEFBQADggEB
-AA3+A4hEH+KGBrY6XhgJpKBTfhtTrkkpniEIeUzycPg2bExIypb1WNNY2XdGB3eM
-TcTrmIUPwjJQDrd+5xU/oH+cxUlYco7bSP5isFzJO9GP48dDA+Mwh+tVkBti9A9f
-ADXVB0/0ulpv0LMw1efxkhLUWYrNcvkFhcbdCuXI5a7VQ1bAs8YK3oPiHamfAJhs
-VW54fH2lNhf9+FZTZjJ44HRiVrmvG9qzMQkprABKehZAdXOU30A7M1SMheujqfRM
-C6PyjKalJKJ5+Dozdnw9O8O8AahzAOfS6rgV2cN5cJek56UEEufuFFpYhsI+2R98
-+FU9YfjsJUnp69MHPt1J/fI=
-</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-05.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-05.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-05.ladok.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-05.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-05.ladok.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-05.ladok.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-05.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml
index 5ce6d7ff..8f9af1a0 100644
--- a/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-05.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ C6PyjKalJKJ5+Dozdnw9O8O8AahzAOfS6rgV2cN5cJek56UEEufuFFpYhsI+2R98
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-05.ladok.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-05.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
index 6d3bbe7c..aaf4ce3d 100644
--- a/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ z181Cw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-06.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-06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 70637b95..00000000
--- a/swamid-2.0/ladok3-06.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-06.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-06.ladok.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-06.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;06</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;06</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-06.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-06.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAJy0tE1KoqoPMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNi5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MjM5WhcNMjQx
-MDA0MTQ0MjM5WjAhMR8wHQYDVQQDExZsYWRvazMtMDYubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ZulKXBiDOXdqeYM8+9xqhfg
-YspChTI4NvTFcgtmV065mY4tJP0aSfwx4c2Q4rOTzwWPyLZhJIJNWUl20nz95c1P
-1PcEkqFuhxs6pRSo8wRhFYcZAm1AuMKkwz+rlAEekzUsaEfXwDWu+bYgddL96NNG
-TGvFVrKZJdZvf2d2oRCsX4e3httlu+yNK4wUKtycDD9wYbXVNi1Un0oFt2o/Lkw5
-Yv5Etnid19dQVW6KUNhYLwmJBOisJOTeJqsalPhUPw7e4La/u8oHbIfsA2f+0KHz
-3riJAhkSQ2vBuNIy/l2rkTKdjjbDUt/ui/HYEGjXPYIR5NljQGjknXQQ4UdEUwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDYubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wNi5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUhAA/TIBsLVPyxVwePvhqUsJTuiEwDQYJKoZIhvcNAQEFBQADggEB
-ADXyYwyBD6043gwcup+xreeIiEtCG5j/o47GGwA9znV9OU6caNvtXNVyO7Mjvpql
-0NUdQL0pCcd+9frGorMhyn7eXF7wyaUYDw4ThOUY74dOP5rugvg3Li82EqOOhtBU
-N/gdCPiqbKKjkxJMZONjQ6BEzqeq32gJVHCC5YI9a7lw0xQpdzw6CWO8D4FAaCW3
-daN8UtgZxszN0dJ6VWpfah8lNYp1Nqkc5dm2s5+vbZKYFGYrOVpI+Mhj7T5P7IX9
-cdzlS3RlY2kbVOG+uqzEMa7wLa7tSZVRK+FkhGvg0GxVS0KH1KK15UTa71fydOLZ
-92Xxj/HwjFwgqFRFzMVk4KU=
-</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-06.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-06.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-06.ladok.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-06.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-06.ladok.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-06.ladok.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-06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml
index eb9b07fa..3eedabca 100644
--- a/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-06.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ cdzlS3RlY2kbVOG+uqzEMa7wLa7tSZVRK+FkhGvg0GxVS0KH1KK15UTa71fydOLZ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-06.ladok.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-06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
index 7b102b08..be41a71a 100644
--- a/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ LB5BtA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-07.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-07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index a38909d2..00000000
--- a/swamid-2.0/ladok3-07.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-07.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-07.ladok.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-07.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;07</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;07</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-07.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-07.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAOsgfFjj/hMdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wNy5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MjQ5WhcNMjQx
-MDA0MTQ0MjQ5WjAhMR8wHQYDVQQDExZsYWRvazMtMDcubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5DBg6PDwC4+C6CEkNGol26MB
-eJsWIm5Ir1UnDZh23Ya3laVl6BJ7XPeqEriYDQhPEzhzVr6oI40SEzHGLxs8MoJZ
-CuMC+fLdwZePVTe3Egv03sK9fHmJ0OZT2zmr6GsfbdTT0GBKZQFVr8K0wTJp8Zb6
-9GAtlERKWb0XH9gA7xBcOAJP9SwRnbF0yPa8JLisAFAHTRnke1jfhAlbmzhdn7fe
-WWF7hwdmm6/H2fOWGRcj+D4TetrLZfe4oOgp0jqwePo40DQQl9HydvLks3wE8BoW
-IBtgueYzGAn9WQ5glfKGpOH+eIGX9f8xEWaeKymCHKLEAKC7Qgf2D9sX8U9+XwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDcubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wNy5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUZwh/XMjxGo6c8it7PdID4xRpjRYwDQYJKoZIhvcNAQEFBQADggEB
-AFkbeTMkoGdJ8ORwMFJega9rncawdLSBwvOVP8oS3pCC+B1FUVgihDgBoFu/J6I+
-wndHcmlt8f2klO4J6AKIIHsC/wDRxdqez2sL6FzIPzAE/JbMAa5BCiIeJH10JNl0
-7p2ZJkS9nKYpBDbXVO5cdmaZcICPTJm28Bo2wI+krWIB1IgH1Qwi+LECBvvWpd2+
-SVM6b6Ht6z8aHkecEuUdNzpJ4yXmbC2GWsRmicYwYo5gT4olPPA6qLUq2SWxE3Va
-g4/6d9o3Ce9czm1s/j0Eeq97ZVGX6805iZmR4ne/rSkSt3w+bhhDjxo4R7lyyUau
-Tf+bD9kP9t0LVFwEIee45FY=
-</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-07.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-07.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-07.ladok.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-07.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-07.ladok.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-07.ladok.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-07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml
index df6c5090..8d9e3baa 100644
--- a/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-07.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ Tf+bD9kP9t0LVFwEIee45FY=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-07.ladok.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-07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
index b683581e..55c47a2c 100644
--- a/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ MTpiVw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-08.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-08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index d59d446a..00000000
--- a/swamid-2.0/ladok3-08.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-08.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-08.ladok.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-08.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;08</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;08</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-08.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-08.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-08.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAO5uNSsUisnLMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wOC5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MjU5WhcNMjQx
-MDA0MTQ0MjU5WjAhMR8wHQYDVQQDExZsYWRvazMtMDgubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA17Ttikn7C8StJRcTZVkLKwpn
-B1bnBxXkW4Nmf/m1+Nt+nO+q/5Mn19h5+ALZqexBNue95/ikK3BnNTddwZE3RzkV
-J2LPTV6fseinRwvhxZDsyeDxyrYPs5cBYVRbYP++XmD0dN31Pfg3WkoPtPEUQ3y+
-iEbgwMv1LYK9hgSRrvA/2rlpbsFg3zI9lHwoum97sFIZxv1GFNhRws/D4MpOX65L
-z5vxAFQquVNQ52rGXwN7P3RDP/1IjqnsBuHUk+nChmrpe8NGjhfVNa/FdZd+iaNR
-Grh80AGencDGOKcbwwyLlkQ6oDEsWAoxmLnaVrZjR2dId9XmOgswcy+xp3mKKQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDgubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wOC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUVPs+VHLQttdwq2k20jXjwE1QNaYwDQYJKoZIhvcNAQEFBQADggEB
-AIW42icVY8jhfhkbT7KEJcN3Ar+BxA7asqf9k2rddH/ivNJcUTx67VLf0hf7Znla
-3/OLPbqW0xBZzONpzqpEXVTB1H1ZIagfd9Z/5+I6tc2m5JLpFCG7aKj274rGxwpz
-olj/ZuLwEZp3zJBoWA9MMCiDGWAgzTS3H9Ys/QTUOVJR+B7HZ6FGTpcsT7IZUpuN
-7hR0zx92QePBX5nZv4p93vUOsj/SdwwgnyoT/c7mT5aUjvX6PtpqyK8sOMKwqrR3
-VmqhSIq31DIL5TJwnV8k1SJ95uWyflne1xoqht0IcL3QONAggkL14fVXx+nUSDVQ
-+IxJFSoCr7+UBhCVQpc1k5o=
-</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-08.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-08.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-08.ladok.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-08.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-08.ladok.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-08.ladok.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-08.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml
index 6900a3df..6b9aa2a4 100644
--- a/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-08.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ VmqhSIq31DIL5TJwnV8k1SJ95uWyflne1xoqht0IcL3QONAggkL14fVXx+nUSDVQ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-08.ladok.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-08.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
index 17ed66d0..e4a5087d 100644
--- a/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ QwOzJA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-09.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-09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 9aa1ad52..00000000
--- a/swamid-2.0/ladok3-09.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-09.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-09.ladok.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-09.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;09</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;09</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-09.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAKHAw32nqb4aMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wOS5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MzA5WhcNMjQx
-MDA0MTQ0MzA5WjAhMR8wHQYDVQQDExZsYWRvazMtMDkubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4qCGNdWn1MRb1t4RmqEFKnRp
-Zwc88GDSNVxdEHR6jRWUyPgugOa/s/b8Ef3J04ajiXdGJUjVkNaaoxOKgH7JNOW4
-29qfjzgKVX4G5Ipcxfbp+/Wn52kXCZfrDUX1e7Amc1tG/tAgNgHdKCj7EZneP819
-RlrDYCRyYP5VAUvWTuujaQFJFXEdgAkWtkfeQBt9HMU2eSCj/SpdDPJpDFI2BKuz
-7z/MkFlhz8ywuFJDZ+O/lNiE9xeS2DEMXQ2Y7tR25EfeXJkSwkWkRiJoNMrtp2Hc
-N1dWsmReAH4NZKahsYL3JsKCzbSsgr/OW5SgyREJFGsTqTCQc7rPw8YsLizUbQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDkubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wOS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUlelU5h8KM7K0SC1Dwm6D4T5ZvBswDQYJKoZIhvcNAQEFBQADggEB
-ADm1+g/0bCQST/RsDvEdy1VfdjLTX+ODy05PiGUy+GlhR2phHhbZ4vddtrV9FuIl
-x28aT8Xvmu47uQIgm26PAtiM1tZYV1JeWTP821NAKfVjl6QKyHnOSksKCC3yOlVk
-O2Vxsu0YyAl0aGvd6FqykxxDClUCSg1nboUhGyr6rgPVxv/+VbI9wNj8QocEDMC4
-55fjM0PeDjSTdjWUPyzX/VFhEtBYrFodS0b9rHWLM+yKKaDG0Gl9E5f9k1uEUNtr
-U83MU1NmV9lmNF1itMe+ujgc/6Af0/F0MTIulAtx1+ZMtIrw3k9at4Auz+urHU37
-RRQKVctmQVOlffVIDFzZgbA=
-</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-09.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-09.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-09.ladok.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-09.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-09.ladok.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-09.ladok.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-09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml
index b793f47c..d0b39992 100644
--- a/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-09.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ RRQKVctmQVOlffVIDFzZgbA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-09.ladok.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-09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
index a880153c..f937bd2f 100644
--- a/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ zL2y+w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-10.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-10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index a49d128c..00000000
--- a/swamid-2.0/ladok3-10.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-10.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-10.ladok.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-10.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;10</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;10</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-10.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-10.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-10.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAMWbtSdAnrAVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xMC5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MzE4WhcNMjQx
-MDA0MTQ0MzE4WjAhMR8wHQYDVQQDExZsYWRvazMtMTAubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnDpADu728OIV57+XopAF7/6A
-0a26Wa8qO0WS4hsIcqPdkIq27kPgsPbm7sh1pKBAQ/BG3wCFSvc3t15ul8NxckCI
-bd4miJxPTP6AIAw3h0WAKGWYmVBKXodhW2PLwkS+bmUva6z2xncWG8/jXsTxPdJK
-ilx+SnLgHgCbUOxOdWgc8TZI2sGpC/8S+wrxiY21/mueg4jMzq4tlTz7L+5bJvoH
-om+qi42iUPYWdbqPXgZx79NjAyA0c82lzbMiwG2OCcPrA0DjajyIsm2c3vpddTMK
-E7ErtBkctwPGZDjypQz7pmIrYoA+O3CO5VdUJfmUFr/NEPo1Oh/QnKU40D6i6wID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTAubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0xMC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUAkkqvZzOBJ82CEDGCrZQnN1is8EwDQYJKoZIhvcNAQEFBQADggEB
-AEq9QB0UetFzg9pXEXPwlpT6Fc15uF5bRxmRMrqi4Sbv7XUBZzBIxmJYdFqzJd50
-nSBzBJ2qDrtkK2FMRQwWNwo86XGdyiufQMlwzkIE0dKBkzHIi+Zqbwp8yGV4ezR4
-twW+VeeLOfAYUdGNQy3aB40c2E1uekz+rOxpGyas0Uhjf97HT6r3ydGYK2gpv3kt
-ZZUz8BdNuajMBgDmW3z2BHnhALPtNBIxNF+8fhUEfFUfjGRvd20Kj5BybjyX+HP1
-6Dl6Et7Dxr9UooyconthAy8uqv4R9aCr+FkFIR1QWbg2rfnR6FVnJ+D9LL4l0JkG
-7qpp/QqMhIdfb1k6Z+/eZzM=
-</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-10.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-10.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-10.ladok.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-10.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-10.ladok.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-10.ladok.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-10.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml
index 1cc694b1..bcaafc6e 100644
--- a/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-10.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ ZZUz8BdNuajMBgDmW3z2BHnhALPtNBIxNF+8fhUEfFUfjGRvd20Kj5BybjyX+HP1
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-10.ladok.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-10.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml
index d401d7fc..4a042a5f 100644
--- a/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-11.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ upo=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-11.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-11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-11.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-11.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 8c6cfdf8..00000000
--- a/swamid-2.0/ladok3-11.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-11.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-11.ladok.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-11.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;11</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;11</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-11.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAPXOQ3De2DJrMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xMS5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MzI4WhcNMjQx
-MDA0MTQ0MzI4WjAhMR8wHQYDVQQDExZsYWRvazMtMTEubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzEpHxy43dFJEhLjih5/bKj+r
-Rrtc4rujDCdbyvsTnzKej/pWPKUg5lWvlvnAjoQutVFLYQ5o5xD+SJJCW9kMyz7d
-vcyOHnFd7a+ZZFFjeNF54VR2JW0M3D/yLT6GftIEp1yHxKZkX4pzZCjHyZOJYXQX
-1mbZ8F0XwMXxGK/y6qhMjc94jY9GVj7ktnCaX15uKnEqQPgN6oKz9QQoPxE6K/Dl
-u95CHpesk/0RGotMj+oEXJWLA4J36wivjZ/+nus+KNhGo/It7cCRU52HzhOL+/bD
-JJyLFEGOSHVm9SPGZnyZZAEs2Bq9Ihcerp0JuGF0HzeEoDZhZ3sVT/7i9rHs2wID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTEubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0xMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQU+C4kgbF74Jw5rlzvpqwTLSmnueMwDQYJKoZIhvcNAQEFBQADggEB
-AHCwnhYWbLeVM+Opyt1DIj0hsSU4Iz+WqgmLQ2RvRq8zPGcSLQNH65n1WBCYNFu/
-Ty0bKpFEZFoagFyn4ba0Bi5A7ItnuyPJ+OWfxbntpSLOZOlulEDLvGmXyHgWjQC3
-2vuurpdqFtoufy7XEPy9LnJNQ5u9cTnp8YVW44UvxO4UJdQoEQWSM/Apk6GX7BQq
-Bp6/gQwrw9NniXTkbPUQghgiBe5iTB1nq6/0hx9zunm19FR/oCsgF4eYbdn67pvu
-99hHPNUGBlXVpBhYSXQ3yjgn107oE2EMYijPxxKjp0+Tkt+DAusj8S7+j/WHzJqA
-dabCeN+PQJ8+6s9gO04gD/Q=
-</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-11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-11.ladok.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-11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-11.ladok.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-11.ladok.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-11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml
index 60d7453a..84c56d70 100644
--- a/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-11.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ dabCeN+PQJ8+6s9gO04gD/Q=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-11.ladok.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-11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml
index 6dc02329..4aa733aa 100644
--- a/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-12.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ sSWjeK+ZudD5JSHb+STFDRSWC7oyQNiQuddlj0hF5L7GnePnetK4TIQbcEHgNb9M
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-12.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-12.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml
index 249282a4..519ae99d 100644
--- a/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-12.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ n1fPE1wPBVcs1yMWkY5e3NM=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-12.ladok.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-12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml
index 6de45b39..78419a2f 100644
--- a/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-13.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ aC9LXg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-13.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-13.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-13.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-13.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 599490bf..00000000
--- a/swamid-2.0/ladok3-13.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-13.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-13.ladok.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-13.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;13</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;13</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-13.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-13.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-13.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAMXbiREMrLiUMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xMy5sYWRvay51bXUuc2UwHhcNMTUwMTIwMTExMTM2WhcNMjUw
-MTE3MTExMTM2WjAhMR8wHQYDVQQDExZsYWRvazMtMTMubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRF7svmvMWTEPNaLtCif5dHs
-fCfLGEClaVF1tu0rSqO1pQ8S6/edCspkSQH0iQh6gD/F6mKjwjSAA0/PLxtPYPis
-z+X2g0QetDiyWzhJBw6V+9E5oRhq+aicQKTEsaRFP9A+dHIHkYakqfbiNIaRYYFp
-GOyXjvFi+c7lJrNCEyXtH0pMdTrmL1zsYSvw4NlDtdw6QBHK2N18cmZkdYKgRBms
-0TP2UKZw11WUxMaQPfQ3u46XlUzQJMRO1YDoLsVAXf33hl8iEjqo6rO5HpVRKT+r
-jIOKuFaLJyr5AJ94AItwGq4BfJJOkfEo6momE8tJsX04O/hW3BWVKVG8QMLDcwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTMubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0xMy5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUxX3vj2H37MihBerj734SQJqS4LUwDQYJKoZIhvcNAQEFBQADggEB
-AJDaZCNDvYQS9YHULOb2gdRVwGUa2FvZX/UNXpVMfuQD7zS+2XA43kwu+sA+Z8zi
-4er1FcMqLznERGYuOwGM10We4Ym319GOPKx8j0T7gnZS2AvgxLzKW9rDNdwpS24d
-aw9k/k8UKy20hfU8Jm1l/cx3rGefd4eucsVwd9Y3wB/Pm0DFjX7yQy+EKHymvy3n
-si86rS+U2UG300QsYxRhE5JMgP/Od+yOuN0VVyko/j7d8yen22f+1mibrNAVksDC
-IPl4TnqugllClkqYMTdsv3PGbm44zu6DUTTzL4qo/SiXGmxNs9mKCrrIKqdlgN22
-zbxHPKCXMByJo3rJ0WuyUqY=
-</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-13.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-13.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-13.ladok.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-13.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-13.ladok.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-13.ladok.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-13.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml
index 5bd157e1..d97ab5f5 100644
--- a/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-13.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ zbxHPKCXMByJo3rJ0WuyUqY=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-13.ladok.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-13.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml
index e0ec8c7b..b8401f1c 100644
--- a/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-14.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ o+yvpw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-14.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-14.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-14.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-14.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index b8e880fa..00000000
--- a/swamid-2.0/ladok3-14.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-14.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-14.ladok.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-14.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;14</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;14</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-14.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-14.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-14.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJANz1RZ6LJaI4MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xNC5sYWRvay51bXUuc2UwHhcNMTUwMTIwMTEwMjM4WhcNMjUw
-MTE3MTEwMjM4WjAhMR8wHQYDVQQDExZsYWRvazMtMTQubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArdcdcCAAmnzDM5X3jagmHXQM
-QnQxP6LpWcOlSxFhju4XXB83Jh+DHY8fbP9XHh6ZL1Bol/ireyEI79KpPL3Ics8o
-tP0dxoxG2uwQ7sdWiRifHUOWL+gU3F1jzHPOr8F10oBBkxPFXdsmt90zWyZlFDhU
-a8NPCb4ZJQBL7kTMSioYmxy2aKvRL69CfsaWglqNZ/oXy6lOCwjJwch0n3iVQDER
-tQvIEuBpXZCYd721/f/bPjoigvFweYYWGJUeWNum8tnO2mrWVGQysncHNjcrIoiq
-WcT05wIqZm0IwytPDT8Y2Zmw6G3ua1eBlApD0OqAP8VlVin3DRy7ZJoOsRSmuQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTQubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0xNC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUUsL/gU0NPNjVc5M5G58QF+UY6+gwDQYJKoZIhvcNAQEFBQADggEB
-AFz+OT3s1pvFxVBvwkb06eMP9NJKlWnJgwSOb9FibhS0x88ya5smmLun2AnXRcGB
-cLrYRsCNJiIh3h5Gll21X8rk0ynrwxs1k9xjb2LTPXkC9YF5NtknO1ZR4Jl+LIrZ
-Nef4RSum18/sUhncWfYaypL8N/xPO8BNhU8D8qwI88WNEjyQrMrsqz5HUxFJgmb3
-NIGsLbCCym0gapILXCVwumUBtuuKqhqwMzurysCg6mRrGaKTn5QDdLU4od+K+KEB
-fad56LiMqe2XQBdVmuC0G6vTwrUGifrgKl1ijK1OxgYk709aHsu8Chtr2iGENcv1
-8zGN8ILH+bDTU9H6P9PXk0E=
-</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-14.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-14.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-14.ladok.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-14.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-14.ladok.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-14.ladok.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-14.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml
index eafd72f6..230c31f1 100644
--- a/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-14.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ fad56LiMqe2XQBdVmuC0G6vTwrUGifrgKl1ijK1OxgYk709aHsu8Chtr2iGENcv1
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-14.ladok.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-14.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml
index 194f49dc..794ab5bf 100644
--- a/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-15.ladok.umu.se-gui-sp.xml
@@ -21,24 +21,11 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-15.ladok.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-15.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3#x2011;15</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3#x2011;15</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -92,4 +79,19 @@ JvDZsW/4WG/6yjj9c/zSH/9Bs/6tQ5cIARH9IU+mQkB3UDdZ9NLqGRU77aHeBsDx
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-15.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-15.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-15.ladok.umu.se-student-sp.xml
index 2eb32cfe..37dd79e4 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-15.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-00.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-15.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-00.ladok.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-00.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;00</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;00</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-15.ladok.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-15.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-00.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-00.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-15.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-15.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJALaiCJSP55zsMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTQwOTI1MDk1NjA1WhcNMjQw
-OTIyMDk1NjA1WjAhMR8wHQYDVQQDExZsYWRvazMtMDAubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7pXel9V/9/sPCh3YGFGK09G
-L6Rc5jCccGNqjWKOr7bPuPfami/UltfcDmKR24ka5540N1F1vMoRa5Jy2SpSw+fl
-aSTRZgI1i4CwVFEbblwirdS2VTnuv04VVnuXI46mW6p6Purr41z8d6W6fUo5Q0Ev
-N6KtTnl6EoIQoAMh8Fe5WuZOkggYtvaJAWWaVtYaqxw4duhhNHRbOmxVA6G7VfH5
-IPzt+C6W2F42QoOXcNQPnz7xkQHa22vxPk0rAiOI166YeA/ytUs7/svY7P3OnUus
-s7nUYGOPe9sa5Y11vVD95D42zSbewLFda0aSPSCr7FUkYdOUIZcWGDPJG/o5OQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDAubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wMC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUVikKoyndXo08xCDD2jx853IrnhcwDQYJKoZIhvcNAQEFBQADggEB
-AAdVurbu0mBd3/p5QBPuYP+pTOQ3ABr6yakpfVbSybGpaKfyf2MZlOHu2LMprbNv
-tvzzAXzrOj0C21pz1dnQEOFNRGtCg+bHdWpgP0NzJl+kwNyztSWoxGmpVziSPI3s
-z+Kc0rAVF4588jsHJ4JMqeEwaHSBrX5lEYFIa/V/aInyF1N69RCNffSwYajhpX0X
-5Q7G3gNErTdpY7VyESfIjKrDNoyNva5oBZBu/Q0OUPLRbgcir3TuauHwdjtzJVIY
-NsnYXbWq6x+lyyXytITJnpDmB0/1iWgykJDFXR6D/AzjVNW3/43F4DSbK+/JFuqX
-Xtg7VBxaqt1Fm/Me7/+LxiQ=
+          <ds:X509SubjectName>CN=ladok3-15.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAOi5DDpBloREMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0xNS5sYWRvay51bXUuc2UwHhcNMTUwMTIwMTEwMjQxWhcNMjUw
+MTE3MTEwMjQxWjAhMR8wHQYDVQQDExZsYWRvazMtMTUubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Fw6AsGSFMvO5Jgd1Is4ySVf
+SSxw4xhHw0Wp5Ce7nM1xDFkATXudVrNdisbCpQBG5HD/iKC1h1+YdmqPsEo7Kikl
+cTehme59j0JYAF1NrxJwWEf7pLiLXOyZNw4of6SpfjSeHoN5a7w/lAMm03qPpPVx
+G+nMWtkMV59bDZ7iKum/05Rgn9nDPvt60RCadd+oxNkHdBIYns4bbpwHmiBIprgO
+zeRz/sX4BlBT3OPySxGOkflw4hy7FfdevSVgLladSWnVle3u2Cn+1C+Jyhpnli4J
+PgQqKMxxeUGMEgfpFgqPGMFMQU/5532kqLTjwr2ZrwphtFLU8yzp3LNixZvrYwID
+AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTUubGFkb2sudW11LnNlhjJodHRw
+czovL2xhZG9rMy0xNS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
+BgNVHQ4EFgQU0b0cuwns7mFHhAaMYCpXI8GGyqUwDQYJKoZIhvcNAQEFBQADggEB
+AErEHmx8cxw1R4dTlpVkjNliTQliMOsp+g0lfUB0O2SkIpVqDgJdZCkSZ9fObSxm
+l0QilFrRldYyOh2XVoQHf1PfBNW86lS1xWJMR2wJxLmeoF7RBOTtkg4y8FXVIfsP
+x65W7aExZS7UsmIgMrvbWZOk3fWrd2xss+Mf3/44VBifJZT4suy49uKl+0IMvQS2
+uC68y7QDUHEdTOElAFOI8NUMffSGM1OGj/STF8fHxhyyd+M1RRxdDWX0/NsfJFAm
+LJSXMPAlv7ZobrHxIKcFL/UyNeYeEMXsxjSAaAa/Vf38guEPofm7AnxZBMdkF8tJ
+6Nw/L9FTpg9VIH4/yPjJcQ8=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ Xtg7VBxaqt1Fm/Me7/+LxiQ=
       <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-00.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.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-00.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-00.ladok.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-00.ladok.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-00.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-15.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-15.ladok.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-15.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-15.ladok.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-15.ladok.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-15.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml
index c853f091..2443407d 100644
--- a/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-16.ladok.umu.se-gui-sp.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-16.ladok.umu.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -33,8 +29,8 @@ 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://ladok3-16.ladok.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-16.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3#x2011;16</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3#x2011;16</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">ladok3-16 - ITS sysutv testsystem för Ladok3 Resultat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ladok3-16 - ITS sysutv test system for Ladok3 Resultat</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
@@ -92,4 +88,19 @@ LVruwg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-16.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-16.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-16.ladok.umu.se-student-sp.xml
index e4ea5d78..5f4443f8 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-16.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-01.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-16.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-01.ladok.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-01.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;01</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-16.ladok.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-16.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-01.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-01.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-16.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-16.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-01.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAPEBgpwK1hxNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMS5sYWRvay51bXUuc2UwHhcNMTQxMDA2MDc1MTMxWhcNMjQx
-MDAzMDc1MTMxWjAhMR8wHQYDVQQDExZsYWRvazMtMDEubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0FInxZg2fEgXhvHMGxn0wAah
-TMCX0XTYmg5rs/fhJ2T0RAxuRCUmvf2ETW/F7makbonO75IDHghExLEUGkxcGK4v
-0uqaPM7/9C799QICJ5cmyrE7tCXOJPO9GAe28Qv88WJm/6DSwngnUryB2r7HlE0f
-UVrMQopRYLqD33eXBFQ732X9nqt9i/R5OK6O/kOE9nmyaBoQdmjZNLYxnobbDNrH
-PrcCje8NFVIxXjOzX8vssEpo8f0DtpOj34F15BSvrr8t5F28UdaTx0Hb7c9B3hW8
-KxAJxs0QHPCI/mgMpBxZBq+9uBLzTxiXvjUjw31EuQI6SJAkyyLBlqHgIUo6EQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDEubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUahPApJv5/xIpL/gbnN8MUfFhhUowDQYJKoZIhvcNAQEFBQADggEB
-AETmm90R56msmOBioztlxMk6TOQbPYVi4NOnqTOokD/X960brBKntkGpXSnNGd7K
-tmK5F2ThcZJZ7FuOev53zJv2lzroBv9t0D8S49I3g4JlEM9TgoS8/hi/bFuC3PCC
-ONwj91gF9J6rzYTum9XhUOChqEg5JJskYHNHs9vmVfhmkHLh3RbGweXm3Da7zrph
-b+mNrM4Y+K+m3IlSj4NBvEIGlu8rf3rl1Iad2HcIevkCgiiCD8V+rumLzXSUTpKe
-ZEqci1h+aWvVDHxYNmDsZbFWOYg+t+Wfcu9uZxHADXvamSFdFAQJqplrSgXsWKNG
-Fgjs4zg7hkT8XjhWJeHVZjI=
+          <ds:X509SubjectName>CN=ladok3-16.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAI4LVuywPRT2MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0xNi5sYWRvay51bXUuc2UwHhcNMTUwMTIwMDYyMTA3WhcNMjUw
+MTE3MDYyMTA3WjAhMR8wHQYDVQQDExZsYWRvazMtMTYubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuZQOEIFO0GzgxubPggKosRJQ
+fnk0hfO+Ydgpgxf+ZNSbVOwC/Iq5bl4jk5qrmACvhTjxZ3IlQhSVVWP4U/zvIuQc
+njBKxJ0vreNFewcHLYOinuvvp3KPGj7e3MJV4lu/8hMEdUQRBptxRhw1rdSxLiWU
+xHkpiMxUdousc4XBIuCItW2ZgIgXUsM0pyRMlfR3JqigbQhobMyQJSmeUr6WERtC
+IlZ8hascSUAol0YOyJrDvhvmE06mcDyonu0DBqL1iOGNZOrLexwfDZDsa0Lm0uRE
+78x3RTWd4u9sloIZRAAYIdt/Cf4koqEhxCWcMJaaJnqqxAWyeS7goMlslicmUwID
+AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTYubGFkb2sudW11LnNlhjJodHRw
+czovL2xhZG9rMy0xNi5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
+BgNVHQ4EFgQUbZqIDP5h2kjmabiOYZ4LC6k3/uwwDQYJKoZIhvcNAQEFBQADggEB
+ALJ27pGgcUImaaCb0bnTGTbD65sKErzIf5GDmWOqZup3gbTBrCR7FTESXot7MBIe
+uGO02yJyTy2v34p5kYB3c4uGjHkG+z7hYlA22etnirpxGD8j512axrH3mwgsIFID
+BYieDQ8K2kxHmu35r2Cl0WDI2ME5VPykhde9Ji/AeP/nx+arsNGvoxZUPB49vIa6
+b2FqpGYWVog/B4pqFwOYJnl5kmCDAZJgilH9bKbZbeMnqi4tnYdqQ5c4f3ds124j
+rsL6vrA6L4FaveTRIMW93QQjcXLDr7IDLdT14XT2kq9pFvGSxxXYtklgqalIFAcN
+8GQtbtQahImLf6wJAaX4vlE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ Fgjs4zg7hkT8XjhWJeHVZjI=
       <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-01.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-01.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-01.ladok.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-01.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-01.ladok.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-01.ladok.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-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-16.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-16.ladok.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-16.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-16.ladok.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-16.ladok.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-16.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit.ladok.se-student-frontend-sp.xml b/swamid-2.0/ladok3-17.ladok.umu.se-gui-sp.xml
index d496e7bc..3c33301c 100644
--- a/swamid-2.0/student.mit.ladok.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-17.ladok.umu.se-gui-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.mit.ladok.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-17.ladok.umu.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,47 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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.mit.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.mit.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT Studentgränsnitt</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
-      </mdui:UIInfo>
+      <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-17.ladok.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-17.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.mit.ladok.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>student.mit.ladok.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-17.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-17.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=student.mit.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNTCCAh2gAwIBAgIJAJ3icKR+gNdqMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHN0dWRlbnQubWl0LmxhZG9rLnNlMB4XDTE1MDIxMjA3MzEzOFoXDTI1MDIw
-OTA3MzEzOFowHzEdMBsGA1UEAxMUc3R1ZGVudC5taXQubGFkb2suc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3GvpMV8JsG+orqyQ1bx9vsley4AxO
-B7nDmfRwX63t22mpyBDer4ZMMwDxb8lNf0a9rzXyfacDh6UkbBghPB6w71onmt60
-rCozzqCUOYwyPwocEQZ9mxelc9dEyN1c8WhyIo6BnhQWPbPr7Y+EAihe4oOK16p1
-w+wyPlKxNRj1g0zOJHvvmg2vbXALyt1xJ60y7vSWKiZEMDpclnTwHCd2icU7AB5R
-EGBGxAV3rGVXQWzHZnDoP0NPr+OlzVbTowTAC7KoNlY0iBZwwtxyI1BolXgU4oN9
-Xlpnu/FroqFAlsCuyZCc3/VLNwiNl7wH8ZOYRBoy+6rJMPVBLf1TEA+ZAgMBAAGj
-dDByMFEGA1UdEQRKMEiCFHN0dWRlbnQubWl0LmxhZG9rLnNlhjBodHRwczovL3N0
-dWRlbnQubWl0LmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYE
-FGy8rVzZpS2hPPUQeQeK1LWAOhgZMA0GCSqGSIb3DQEBBQUAA4IBAQB2IVqSGbpJ
-qO1bh7aHHdnnmw2Wbc3jnyU8dhbJ4PuEii1m6rbu8b+pdpwYjqit1UZ2RVjzaL38
-4V8hCooWybOQ5phNj7pohwUqliPOX4rockK9nAhk0MT69KYArh+VfsvBmN9sb5uf
-Cy4YS1P+vUWvWJqwmCwuKvBuCu3K8zI6QELhHFpafXTvkz+K+z3A22G1FigBqsMT
-ua2Dzh2zE+wfcRwqZ+GwH0mN0iqxDJUKqgs9aEsl8Q9iHH1cmBYOMQnCaCIbnd6l
-Xp4VZ3QgIMowFfU+rOyCR3jMz8kW9hLPuIGQXq65q14lETenxSds3d9Z6TGB6Xbc
-aQxSEmvTJulB
+          <ds:X509SubjectName>CN=ladok3-17.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKSUJzaUebESMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0xNy5sYWRvay51bXUuc2UwHhcNMTQwOTAxMTQ0NTI4WhcNMjQw
+ODI5MTQ0NTI4WjAhMR8wHQYDVQQDExZsYWRvazMtMTcubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtiZBBz+w5yV7tY/hHv75yL3e
+Wwb95IJ9x4ihIQJhgldHNXIcFLAo872HM0tGy3KIVgC66I9gPXzrtnjkCY2fM+6y
+jzo8HYsYtahj9og9tzc0ziMMRI21CkezauBZ+4Ll5iWSYzJKQenJoh1xIURq7FEn
+QXwiJCNGESB9KYqvjSUCdk8y4nq9ZDVKtgFQdjSeWHmR6prcNRvxgqwPzeny/jEi
+dNw9e09vN0UBIImVj4Nb5iBI/4rOT8+yphBFRxdfsDrogt4SQExHySgM/TR7hlt6
+V9u8etvAKdD3Y+Emuaxbab+WRh6Ewt327NCVQVDskYBPbUNkrDl0laCMqnJl2wID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMTcubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0xNy5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBS2Jth0
+DBKD8B/sEaQx2ltsC/G6ITANBgkqhkiG9w0BAQUFAAOCAQEAFoMeW1B9XpWAChXD
+4BiUlO6kZYKH4Pl/n56Qmf76P2qnrx3Fs/XJSoPUITKhXTv/oG22/T0/OTEGfaIx
+apkh8xmhuizWQOoVLRVBBiS85yEoCjN/+fdJ6CF/Z8wMNu+KyTYhn9OlUhgOhdF3
+SDE2NCn9Xi1qCBSRLg/xAyc6ca1kiYrgtwO7lpCO+1l7ZRRBQIcr+Od63Q9NF1JO
+xe4PfMc56haOW1076HWEA1gyUbjyAPdo4tJB+x1sYL1653VF3z3wLV+AhVGzrevS
+WjHtD4rIy+bhfP9LZwah96A0w9pRe91EcPyHsYaWrxG2yHj/YvejmLyI2OBQYTGP
+XUiL1Q==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -75,19 +64,34 @@ aQxSEmvTJulB
       <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.mit.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-17.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-17.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-17.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..e774f68d
--- /dev/null
+++ b/swamid-2.0/ladok3-18.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-18.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-18.ladok.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-18.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-18.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-18.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-18.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPr22l3//oVHMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0xOC5sYWRvay51bXUuc2UwHhcNMTQwOTAxMTQ0NTMxWhcNMjQw
+ODI5MTQ0NTMxWjAhMR8wHQYDVQQDExZsYWRvazMtMTgubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+dpwTB8KRjoZaSVUsKcuCt5
+2KoRcpiX9ST9LSBVUkrcnGN32eFukVBsAzkW+fqMRHOzQtmh9QwCJfSM4M+OEaYT
+tPUnyWy4R41wQdXsytPr9j0qgwH73dwseMWLbHg91kKxcCkW2e1FdhBPMPU0fVxg
++HNa9muzrNZlzH01nBjp51knWKu9FjgLYtSK02LJe94SSfCUqASO7nX//Zz/vnHF
+9A99suMU1Y61eb16gSXEzjam81Zg+yvETyyvPuNOsYUUoroZs28hnv7os2rFLEWm
+5ixEW4FY97k4d+pYGpVVZSSgxNOCYLzG1g4Qhb056j+tkj1QGR75J3KFsyaLvQID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMTgubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0xOC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBQh5YGK
+T8bRSDx4TE4oiwnFbJJPeTANBgkqhkiG9w0BAQUFAAOCAQEAFgzUarmb/7lbtGeL
+9fmhoMT5I2ZdIeIxNeOMIb756rppiZFzAxO56cdLs/spZkCXNvILtaowIP3icTao
++vaTUxi/xYLZL1T3XwPVA/mkj0mDnTHj3JwgNYDL9TbnBgvZdCyvzVploqiRigrY
+HjexOvKTA8RNz1L6zIfBxKBOItLIbTxK3gV1EQE4XZx4tdtrxJIcN8/c3hbo74EB
+fVb7v8waD16URmv2M3ZCdVnGUgDOrJcqktWd7kqP5MnoM6gHUCyX3G/TN2fUWksA
+r4zwr5iAQmjneNFToAVAsuZkMUY/tI6X8yWmQEihY/+toVzkG6FNYeEKkYqz8Ein
+HS7qIw==
+</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-18.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-18.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-18.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-18.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml
index 211a7e0d..2e98259c 100644
--- a/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-19.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ IJHO3g==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-19.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-19.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-19.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-19.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 1c9632e6..00000000
--- a/swamid-2.0/ladok3-19.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-19.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-19.ladok.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-19.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;19</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;19</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-19.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-19.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-19.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJALJTVfD+H9mUMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xOS5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MzQ4WhcNMjQx
-MDA0MTQ0MzQ4WjAhMR8wHQYDVQQDExZsYWRvazMtMTkubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzpB/1DSoezs6kRVeY7ulb12d
-qb67A7+tVjMF7r0wsyQAzZFKaSEAFSO6SI9xkDYAbZZoW01UCbTZxs5WHYGdy86U
-m9WzPmVPrehRFtzWV9UdgRM5TXHmxFWMRotIPIwaOl/XeCU0oNZgh4FOihJAyFPd
-+BwYVn2/BiAzvvstFU8NGMjqsNLZwt1agYnORoyRHxLMnZntKGi8azgRn/8nkiQf
-wnCBGpydsRLnbhsHKr3TYarG4/+jxK/EKP83uak2/acHGDSNKeYvvrnGoCfeHn3f
-POrLBrFUx9sTTnIiwM+A4jm9LKYGRUq390WCmryHyjdzoRtY3NsE3dDqadHN7QID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTkubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0xOS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUL4u5ZAOrCjPwFL+5D/VNUKJvwNUwDQYJKoZIhvcNAQEFBQADggEB
-AG27SJJpfeTklLFyu/yz/GBz8sj3bo1XuohAEU2/XHYVdmFX0t+TH6JaVdv3QUYB
-v+1WZaG09pu2Zk+aSbshuiLNZero0qZglqBOyXSWcxtaRzrhyj/uNbN6IulqRdYh
-55sEGpEVPcsDF9MPERcYAEoPhLhujcdylCXt0SUv87KyWq/VtosjLJ0xdi05OwSL
-QzIZe74hia5hrlMTEIBHrYRbTeO2q3LZcpmQhlIbNBEGfzfWGUGMHMaxlXtmkatv
-NAiBKYQ60AYd/AS/yPrpk2llTUHfd6tdvC4SqKuiEYsy2pYvfN//PPFrdI9mr+Ir
-6ZrQ7PTbuSPLTA2boFcCHgk=
-</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-19.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-19.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-19.ladok.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-19.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-19.ladok.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-19.ladok.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-19.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml
index ee63c419..0dc5931b 100644
--- a/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-19.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ NAiBKYQ60AYd/AS/yPrpk2llTUHfd6tdvC4SqKuiEYsy2pYvfN//PPFrdI9mr+Ir
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-19.ladok.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-19.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml
index 6a49755e..090b1529 100644
--- a/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-20.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ zxjcig==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-20.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-20.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-02.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-20.ladok.umu.se-student-sp.xml
index 8905b2d0..bea61623 100644
--- a/swamid-2.0/ladok3-02.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-20.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-02.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-20.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-02.ladok.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-02.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;02</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-20.ladok.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-20.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-02.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-02.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-20.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-20.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJALj7Nl5UzAxYMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMi5sYWRvay51bXUuc2UwHhcNMTQxMDA2MDc1MTMyWhcNMjQx
-MDAzMDc1MTMyWjAhMR8wHQYDVQQDExZsYWRvazMtMDIubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QZLrV2v1EAjGi7qFqomDDF2
-lECHcdR0agTowzMaG+xwY2up2aZCMsuLBGFTaRxKUASnkU7GABejW/iuWwVa77oP
-6rBH5g0Gv9abpnvXVI1/ZtLj4XWfL8l7tU7nAIvu/Yrp4WStRUdEs4XfIo63/uH+
-kiQn/S2+MpcJJTFvFf6z1NUOGMDKnCuuGzwgcZzSw9PAkKBKwSoTZnHTp9jpK1st
-J3/yJS6BiFL8IXGn1zZdPCSawGUbKv4AUqLtFvCal5VRUVqgCzyy2/8C9s5aHIx1
-nhCUXN1TNZ6MJ4LloQYMizQ4fDI15a7L5ti0N518X3g5PHmBxg5dXk52o1k9BwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDIubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wMi5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUzNkoe/PfihG1DgUmSmY+vQlkX5gwDQYJKoZIhvcNAQEFBQADggEB
-ADcGrCqMm3M8QlV3l5JAl5nMRFAQs4rFhvu8ruAl2PJWZWHQywn8iNpCyN7tVCP2
-+RxP7Im8oopZ3ziLlMwTrEYFH8PPrdjUik+oSm5O5JHvqbI4+HH1XOa7igPxSxct
-IZl9GY/t/3nMWWb4DBitYOSwL35a7ntfUdXNwfgKVCAIWp8p8LoWeTDD4TUHis0w
-jUKo59MnfwPUm0RVXbrtiTrNUu+RiGNzrAhc5n7g4ZI2JhmQ5Q/A8pEGn6Zy6Ct2
-fsgw6Oh1LOHpmDXNRh7Tsh2kHxa9+bHJNFAhVZC3MN5zF2+oNbImOdjMH6XtjOnf
-V2U1emX7Cc8OvH12y7nKZu0=
+          <ds:X509SubjectName>CN=ladok3-20.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAKGX29XZ1kK7MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yMC5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MzU4WhcNMjQx
+MDA0MTQ0MzU4WjAhMR8wHQYDVQQDExZsYWRvazMtMjAubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+4FMJpKWw2z2tQhNVHya1mw
+s+JyxTgTzEicWJubj6f1vrEC3d/AnSiMn5pNyllHm1N7aLlR3j6eGC2pXq+uNUA/
+GuEZCTX4O8t4yNxCPPDA/YZQJRQWImJOc85cxNQ0jA7NoGTtm1/9beD+cCK2U2Up
+D25Izh+jKTfty3d9KkFLy5Ij6HUPA1DSizSvrsYzR9IdvJG6EBnQZyZc+AQ5mmG6
+CfUn/BDISFBTKK0H8IiaZhNm06RhdlHNLd0F2SaPn5GS7X1wAjADaNru8bZlUyFn
+a2r87s8rwWHw78FuuVlUfsHHDxzDVxV61rSfGFQTQ68EFxwQworZfqqP5AR9CQID
+AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjAubGFkb2sudW11LnNlhjJodHRw
+czovL2xhZG9rMy0yMC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
+BgNVHQ4EFgQU2cQMGd0KQgguGKwgEK8RMv0CSdgwDQYJKoZIhvcNAQEFBQADggEB
+AE52oq3rG6BUB+s+zyGUob7XE3ItbKWR8fm6uoYsaKC85MCbpIQWDw3jIe3XU28K
+t7BdZkLQ9cPFB2UGpcha29gOvKsG42itINpIoJerC4kQx0zgRdsNmmqTwSfxVx/H
+DiNzQbCWU08K7q8NMCs6P4NszLp+6LJXdG3HRw4vWRTxRxqu0KHPy6xmHYjhXL4/
+7IS8gB4E0b25QNoqTdLtl2U4EQhEofEmOPcF2ty0h+XPv3sU+0ytaII8EeUnVX8o
+Mg4JdHcDNwDnt2P2oFNOkzZYfzm5cSIfZdHMV4ycYRSNUxokQrfFCQLcvWMSimaH
+prCutGsiape3JHL2BV4baLs=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ V2U1emX7Cc8OvH12y7nKZu0=
       <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-02.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-02.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-02.ladok.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-02.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-02.ladok.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-02.ladok.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-02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-20.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-20.ladok.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-20.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-20.ladok.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-20.ladok.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-20.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml
index a83e1214..5bd413c8 100644
--- a/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-21.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ cobHWw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-21.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-21.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-21.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-21.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 4656153b..00000000
--- a/swamid-2.0/ladok3-21.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-21.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-21.ladok.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-21.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;21</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;21</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-21.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-21.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-21.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAJSSrVoFJ4N4MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0yMS5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0NDA3WhcNMjQx
-MDA0MTQ0NDA3WjAhMR8wHQYDVQQDExZsYWRvazMtMjEubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApgkSEfWPTzFHUHpcyu8r26CG
-8BU6OCy+8PRhWZJ/xXnuljWLa0VvWdkjMItHDR9VCjtLIK5t5oGbTiqPEsb93anr
-VqcgIPz6AYeo0SXJcpBdFuF3zGyW3yfUfoi6t3g4ikyAsQFKbX7wDg7vyUTKo15S
-VBbREkdmrYFb3JEByjQZjKbZUjsU9U78HjrzE7WCvDK4DDnzgWQg+aN6LHKHvn2H
-jZlerYpF30aZKAXGvQh+HHNwBvfd0wE8DgixeMdRpId4/b+BMs2A4Q5dcn1fGcb7
-+JzTXxhHqtL/hiH055IYT3HHo/mTseJqoE3R1uT0FASsl21MYcOpqpnBNAKUZwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjEubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0yMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUea/KnYVe/DceUeFfUCEnrpCOoukwDQYJKoZIhvcNAQEFBQADggEB
-AJPsk6/BRaaiREtL6YzWQxkC7I8h1yhZpGSFZ2FPemesuLOFREva62qBYTP0IbZV
-tHvM/R/IsLo1yw8C5Mk+GTo3XPzgeTgNvNNUiK8KsKc+nVP0D5HUzodFxuRnu/HU
-FOGMknPKeZHfHe3UZJaXDbTogIp+KUWt4W7xJyVnuLMywXTSy2h52s5H6iFJQBaf
-ey5yjTkPrBrnTI/Z7hx9fsYDR8oZb+U5cwz+l8s9bkaPXX9043nzgpgm9A/lma7j
-LSXPvEPTHzAkNoiAXAn5jW9xE3fsWdJs40SdhR1tcZ4LaaaGRvFCk6j+QIXLdjuE
-4KRUNahlmikpWye1rQPSZuo=
-</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-21.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-21.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-21.ladok.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-21.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-21.ladok.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-21.ladok.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-21.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml
index 3d567729..2d815315 100644
--- a/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-21.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ LSXPvEPTHzAkNoiAXAn5jW9xE3fsWdJs40SdhR1tcZ4LaaaGRvFCk6j+QIXLdjuE
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-21.ladok.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-21.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml
index df80dbdb..60c89ee8 100644
--- a/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-22.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ y3bsRv7NPODV1vABsrLjXqfNUmWti1gFX+Nnagaw5u1xMLcjhBme/7fqGwrI3Sct
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-22.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-22.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-22.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-22.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 1f084ab3..00000000
--- a/swamid-2.0/ladok3-22.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-22.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-22.ladok.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-22.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;22</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;22</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-22.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-22.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-22.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAM2Ie1tFNFQoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0yMi5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0NDE3WhcNMjQx
-MDA0MTQ0NDE3WjAhMR8wHQYDVQQDExZsYWRvazMtMjIubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2HDvozNEkHlvgZzEi5cJ7uY
-UiGAjQGE9OG9TzGkRlFbSe9i3yQ4Ql58jY8WDl8Y4IKcwcRJHeXRcBqJW0END1bC
-/2NbN5az7eiitNQOqHilvJnI44rv2+waQmCMaCQqrWjKbLHaxqZOIbrUWn6dbYs2
-R436ftnjGTVrOggaVI+WKDvC1Xb7Lg+SHWBz0JiBmJciJ/31ry+aeMpyYXmht5/9
-WA7eG0WxUrzTVBrHLqrv7ttm02QFhfqnSgTjN1q6LVU8CAdKlG5rHvwz7BjVdQgr
-4ef9NIfvY/NPXjiFeRdzUCbo4eNqhb9Owgy1JpMfVaF/8FHwp5miCF+rT1p/NQID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjIubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0yMi5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUcQ9GZssn4OVCQkXo9VdxOrSwvr0wDQYJKoZIhvcNAQEFBQADggEB
-AG5I6vZKFSes7UuDSGl5LFmJh76MXpP85SoyXNlKvVeeA8o1mPYdliM2+Vvjeq8j
-Pkkt7jA1vROZ9GSKbQuc78ee8XHWnIuYDW/c5L++SGif5QXFcsWG50GRmOv0/Y28
-evJ3RnMveMbXDcXVSyBqAtNEynOMT5rx7TNTNpZBKvjzYE7evzSnbhuLzs/wdutw
-SJbdq5BTzrdWKHvpYli5+38ZrFu+GHRdujixAZ8YJA7SuHisdKb6hdC0cfr92M5M
-fg3nmMBnJcjFAmgg+bPEIfg3Plb0JbxtUcq2CCNL74QwoyVswpv1Auw6ahb2eSJX
-udv5m2jOU/2r0ZbADQVJzjI=
-</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-22.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-22.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-22.ladok.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-22.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-22.ladok.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-22.ladok.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-22.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml
index db4c36e1..3ba310f5 100644
--- a/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-22.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ udv5m2jOU/2r0ZbADQVJzjI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-22.ladok.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-22.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml
index 017be164..bad3979b 100644
--- a/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-23.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ vH4mRA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-23.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-23.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-23.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-23.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 53e1bd07..00000000
--- a/swamid-2.0/ladok3-23.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-23.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-23.ladok.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-23.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;23</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;23</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-23.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-23.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-23.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJANMaJQIHvD4NMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0yMy5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0NDI3WhcNMjQx
-MDA0MTQ0NDI3WjAhMR8wHQYDVQQDExZsYWRvazMtMjMubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2cGiumvjdyZKuwTntxWlX3x4
-5LV7nqUJGz0GlJ2qvKV2OD9DPc0as0BC5HvUpEd9T3gLojW0B7HOJDgOUVPEdgGB
-yGMyVdle/Ig3HD3S1AnupDL1bqvMZn/hU/sGRqDyJRUf8k+pFo39sAYqt5OeOXQu
-XJdCYfGCRBtu3kmG9kxNHjt/9FHzwiwefKZW0Nn0Wtc5cgMhDpx0iOCPc6Ckn0kq
-/KVcSlm8SnlGjMVzIJfUef2IkCw0qA0Wnt2CcCycK7OQXyP0YwLh9WPHZXRTKQxi
-paIeotdgZkccXEDFYA05l1deS1MtqiLoxarUFIgcM3X6kThHRmpOufMRLWBjKwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjMubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0yMy5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUODngsWRqAupbWEp7N9nRquKqkAQwDQYJKoZIhvcNAQEFBQADggEB
-AJmntLsSPqmmFcmrZJ4XixCDYsYlG88e0l0ii8FpEwCInneYjroLbrb5Od1JkHXR
-W+q6O1GMQfaFSW9YN5xcHoLtK20tRscCufVTlA5rj+Xks6vGT841Wf/pn8kEF6hW
-6RN+FBsEkFu1ACgbieyw4npngpYB8diJe5Ttcsvl/wRP7zjD7roP9K7cpvC5s694
-JO0lwUmaPXqAh5Jqh29w5EN+59O3xWJ9Ec37tCY5IkkcGnB5uAfP93K5eyMafX9V
-cA8Pb/ntxkRoZoGUw/oqpGrIpZMvGOFxehGdzOd+ZTpf9L0R37byGM94pTq6gz33
-69ezgM07kER3QrJpPLCrLT0=
-</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-23.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-23.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-23.ladok.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-23.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-23.ladok.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-23.ladok.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-23.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml
index ad59e511..0eb1ca47 100644
--- a/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-23.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ cA8Pb/ntxkRoZoGUw/oqpGrIpZMvGOFxehGdzOd+ZTpf9L0R37byGM94pTq6gz33
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-23.ladok.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-23.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml
index e6b6037d..2cd29567 100644
--- a/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-24.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ AHgxyA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-24.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-24.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-24.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-24.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 134b7775..00000000
--- a/swamid-2.0/ladok3-24.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-24.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-24.ladok.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-24.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;24</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;24</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-24.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-24.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-24.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAM9GWy3OuQ/iMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0yNC5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0NDM3WhcNMjQx
-MDA0MTQ0NDM3WjAhMR8wHQYDVQQDExZsYWRvazMtMjQubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA05MWDop8dPQZhrGXHpbJoUfN
-OWH9xOQBd7DYjVs336VaygNWQ51+GJhqG37T5ow3U9Pbo16xxgWKm3j1fbovoEGP
-TcehDJ3aHcnffF3GGWyQ5ALLnEl6sBeIsnDntJezXExouYgYRxcUYNDeN142dQcO
-1/erSOGpY5vaN1HTr1mcKwSG+cj0Zf04fwUw1XtJTNrXNMr4320WyjSgLrvFmqYg
-d8DBRQgJAwBefT7SzE4x9bddnfwdkolT0p2ZL/ruLS2DRk7Td8G4j+l9K8rwt9B1
-vzXvgqAR2Zga8lo/Cqy/JpMl/uW45JIKimcS4Nu4yeLuhZ/wf8a1opZEQzumCwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjQubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0yNC5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUjvmvCf1UdJmoBI3qlCoBOU1ohCIwDQYJKoZIhvcNAQEFBQADggEB
-AKEQjSN0Swj2r2+CyDe+/0zA4sQ4iUBlcge2Bba8Q5PIziByByJx95gRMGsTSxwJ
-q6Jy890QU4p3gqhjjX/J1GLUYutQ3hmL8Phemkq8oasP9L7B687mh6CIQtCDXK1R
-vcJCZtIaOuJh0Muuref7YKk9AEiNnKN8srbNEVxc7kPHKd2gorqshJc2kCgoX5Z/
-Ig2kEKGOW3Pu7T6ay98J/YdwNKw6Qi+6mozddDCE6tS4yEZ1z6ets9smZacd+NTo
-iV6PB1oIkO06lmDDHxUNloyeK5kBcCtk1gnBtvBCzBumj/Sq/p6Upr6QM7MV+fiM
-QU3oSUW5d9AK8EGOvHPJ30g=
-</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-24.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-24.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-24.ladok.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-24.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-24.ladok.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-24.ladok.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-24.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml
index 87a31ee3..f4c70a6c 100644
--- a/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-24.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ QU3oSUW5d9AK8EGOvHPJ30g=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-24.ladok.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-24.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml
index c8b4782c..4b1190d0 100644
--- a/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-25.ladok.umu.se-gui-sp.xml
@@ -21,24 +21,11 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-25.ladok.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-25.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3#x2011;25</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3#x2011;25</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -92,4 +79,19 @@ Iqy6Mg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-25.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-25.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-03.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-25.ladok.umu.se-student-sp.xml
index fd63835a..0bddf841 100644
--- a/swamid-2.0/ladok3-03.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-25.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-03.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-25.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-03.ladok.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-03.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;03</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;03</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-25.ladok.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-25.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-03.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-03.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-25.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-25.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAIhCSM/gXPV2MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0wMy5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTIxMzE4WhcNMjQx
-MDA0MTIxMzE4WjAhMR8wHQYDVQQDExZsYWRvazMtMDMubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQOsQBm/doFi/rO80GvjNJGY
-/hrRllUtBkIgExc/oqEkKEXRH/yp23e5P8aS/u+Z+Ap0e0RCLqQwAi5yVCx4IIp9
-wEu/trbuR75QF9XIGO0cTy0PrcOyZsAjCk42QmdsUWWq/3jv9G+f+Riny0A0yy3y
-5k//tCZPVBQ+6WIhxbSk+yJM5cec4g2exA7M8fWG/i9Wb/7sWEjN0Kz5GTgPLO81
-E4/Ji7oJh4zesuDyFlfCn9wHx7ex7gzmP1H5uTkgfy5GGTZakzVi5dc9oQICY3xA
-Dqx95pPNugXlfmZzV6M9aWmPnLvRO17LX9uOD5hDHsqhnqppOVcNf/YEbYxH+QID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMDMubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0wMy5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUbJhrFVcaM2PS/pjQJjhusF3gYRowDQYJKoZIhvcNAQEFBQADggEB
-AJh7UZv2qYzT1FCI0wGEnqPfkxTYFLvjq1zSp1u4WAlvVXPkN/KMbqIgzzTSW3S2
-zyImr52uqUp0IWjbg+iAk5e8n4+08gJMwWcpidfs9U0avIu9YoMz+qjQ5CyMe6xR
-1w1DWjbXQnB75XAtrOYCm7RH9sx0RvpfFnzUT92z2I+68Jl4499eeBzSprJuRjYP
-miF1AohiHs3zkZAlP4BQWc1utAp/fv5ls2pnepCAJvePieJPalI19r3bd1cLU+A7
-dwvGpzDdwMxXKv+cQUdRnCE3IhzFb8X57J7pQApgGPnzt0H9uwgFPIEE8mOaQM4U
-IlstWICQczAoX1y5Ow2IOEo=
+          <ds:X509SubjectName>CN=ladok3-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAPIYrHJ7xC0BMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yNS5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0NDQ3WhcNMjQx
+MDA0MTQ0NDQ3WjAhMR8wHQYDVQQDExZsYWRvazMtMjUubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+lTkpjLgTeB4qNGbLT9hIKxv
+DIglvxxWbxf91fUuJ7z7+VRdJ+Yx1EiDgocw+mxwmR0T+L+yMoLMk/1yX3I+bsAe
+647wTrY+KYfb6a6j1z/id+fHO6oGCjmhDMpXmm/y9lNhap7jorjRXxd5LDQuJqzI
+mf8wlb68haZuXPLyxm+Yhtd1aw6hoS7wssVeiYkJG/PJa1/xtDPYF5LppEvoZw3E
+f/eFGBbaS/i8L2Vx9bEHlFLps1v09k5vL2feb6s9UrKDIsFN4IHXeUxpjtycsZ+U
++b3Gfupo6ZkA69QUVriZUumji/deRZbQ8aqz0hK03GcZrjQsSwM4AflN2dyawQID
+AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjUubGFkb2sudW11LnNlhjJodHRw
+czovL2xhZG9rMy0yNS5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
+BgNVHQ4EFgQUJ6CC182KgrphkN73y8OveC1o1xMwDQYJKoZIhvcNAQEFBQADggEB
+ACX/HUND+XeritlsCdvsL8ic9dI0FKGfvo5ARGdr4XVV3gfSjj0z7O9j1BWB5h2c
+W3y6EUznRXeEqH9MkBmaQBK212itTBUiyUQ+6nAJHUdLZlsuGtB7BdOfA65uZjbc
+Eq/51WEamMYIp57ZB9+nRIGE6e6lMiXAm7RtFLhfIQGQsgcNuFWRi00bMaREl1oq
+Db947bFUTo1HENrqE21ADQywKXOVd2PcZ9rDYy5sHKefQ8wQGx5JBTQZJdpoYr1K
+tSgFpiHGzQ2uaj4+ZZJqFcr81XcOJ+nUEBl9PabtTVHGLJRsVqisIvjqCk2UDVyP
+QtMsCZ6mBPfkyp3MQt4ZxGE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ IlstWICQczAoX1y5Ow2IOEo=
       <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-03.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-03.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-03.ladok.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-03.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-03.ladok.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-03.ladok.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-03.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-25.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-25.ladok.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-25.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-25.ladok.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-25.ladok.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-25.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml
index 7b6d7e8a..fd1304dc 100644
--- a/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-26.ladok.umu.se-gui-sp.xml
@@ -21,24 +21,11 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-26.ladok.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-26.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem ladok3#x2011;26</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite ladok3#x2011;26</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -92,4 +79,19 @@ nI2NEAestQcqgqbNRyj5JMCFhj1Q1yJT4oo2/HMVkscc9HJGcoes6UBvABxwfyd7
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-26.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-26.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml
new file mode 100644
index 00000000..0d703e73
--- /dev/null
+++ b/swamid-2.0/ladok3-26.ladok.umu.se-student-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-26.ladok.umu.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-26.ladok.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-26.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-26.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAN1ywbsQpPTeMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yNi5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0NDU3WhcNMjQx
+MDA0MTQ0NDU3WjAhMR8wHQYDVQQDExZsYWRvazMtMjYubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4uUGncG1qjUauMKJObc2w9ty
+BaGCY/4JKpTlN2NqOrzKowiopMI0NgO8oRklHIIpDkXMvI27KEPQfioFf5MWnjuH
+9AUEnsAden0c2lZsPnBsbRJq4G6apXenpLyc5cn3JvjwLC344FcOIIgniwb+mZCX
+V5jnkcM3I/5cjLWN9jGxYTuZEA7vEfWx0XF4am+rTR+yHwhyHe5C3/Y9qQ6x+tBL
+iqbtfUcJ9CF0PkDN9oFA1kxtQF8kHP2+cofHpLL81A39Ia8oR4L0Pc9XBJPeBw0k
+05LhqXdXdKmo72R9nnEteOcvRhLD/uv930LINfXlgdi8YTpPlRreM/tPvxa2qwID
+AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMjYubGFkb2sudW11LnNlhjJodHRw
+czovL2xhZG9rMy0yNi5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
+BgNVHQ4EFgQU3kHGUxhwgT7ZvMxr6fKS/SZh6RswDQYJKoZIhvcNAQEFBQADggEB
+AHDTwsIAUb6r6jEbMOVrSJk7DLu2sxMi0/xPqB8U1LG1M2m1ThaXJiIncNDDmx6J
+Ztjfz522dnI/9cqmU6zFHg0jHIBBOQbnpf8s/MXyr1h3sqJ9n3mPlCl6QRLxsrE0
+7w22L8NvJFVAucX9nPWa12JBVdrqOyg/dGulrd2VaH73EKSpUVxMZ47tgtAs287q
+TZtHp9BYWSZaaE238VuLTZgRFVWbeJaWipKpgTKcdr6iTthRXjsW0VN7wQv8iX3j
+S3wGxfaFGpWTdzfb1fzH40iPkSbw9vzr4R8MPfnoENsAN2C6Nqa+iAxjzyn+bMum
+2wd0znX8hxkAKdKbkc6nF0A=
+</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-26.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-26.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-26.ladok.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-26.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-26.ladok.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-26.ladok.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-26.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..0d812bab
--- /dev/null
+++ b/swamid-2.0/ladok3-27.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-27.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-27.ladok.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-27.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-27.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-27.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-27.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAIVxLLgIBj63MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yNy5sYWRvay51bXUuc2UwHhcNMTQwOTAxMTQ0NTU5WhcNMjQw
+ODI5MTQ0NTU5WjAhMR8wHQYDVQQDExZsYWRvazMtMjcubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx3ylW0+MZ7XW1GjhANoH+WlO
+ZYpgxmy+P1TudO1uGpgR8BHAZycWWrXN2HPrNhnxhVMtXJMng97aVnb/OwoTqz2G
+aKb0yREJg00MxzsM2P4LJRMxiuqqMZSIDKoUR8TE3zSum9TTCxezeLUXvY/SUmpn
+Sj4fs2beD3LxdVbcBQwayl8Gefj9WeaG9m57A/WMqZTZR3/IhNgJGipfPoN0vIOi
+hcCx30t/5Q/qnqp1XFUshvDaNb9Qhz8VntLWacqkurkA0PcB6b1AJEdXPpzNk2QW
+lu+f4x09Ip9gPJCuhGWUe/UgI7YgEtSJDEiDutoOQJq0cwEN5WCpSQfbdBthewID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMjcubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0yNy5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBTZX8jm
+s7WYrxC5mpah8U5E5+FZdjANBgkqhkiG9w0BAQUFAAOCAQEAJI1vdORRKyRRldIl
+lvp3C1UCCHZEjN0cy8VXCnOJkwsZa2lBR0S3IbmvtUpffaELHKxH/675VBBNBdtt
+F7+HE1VdfIzpXljAnIHgw0dRxNhKOBnHpdWAOh/k6PfnRm1MfAp+/Qt43+WS4B9V
+nE4GR3vQufifEJj4uHuOR1tr2D9l/W+QpQfEJd9m4LM5J6a5AN/AVTsjWcqWpmW8
+AYTyvhNSEpKa2c+o+Aeix7NmHlfARcqbmr+J3pRYkmUsVrC60jiPFainWPMf/eIs
+FF/kliKS2LIeTaHvGSZqQUIBpgpxiQcjryN4pLwcvbVstu2y5fW9MrXgBWLG0BVY
+nU/m4Q==
+</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-27.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-27.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-27.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-27.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..a94a2a52
--- /dev/null
+++ b/swamid-2.0/ladok3-28.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-28.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-28.ladok.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-28.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-28.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAPMwPvO9i8QtMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yOC5sYWRvay51bXUuc2UwHhcNMTQwOTAxMTQ0NjAyWhcNMjQw
+ODI5MTQ0NjAyWjAhMR8wHQYDVQQDExZsYWRvazMtMjgubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqavLyCeqi2sLcJfcVwkZx8WJ
+qYuaQLJoLTyza33qj8QJE4yfZ8RbeaTspxCbWdfEedv/9OIA4Fx2o8KrNt/J2YF+
+EPs0q9mZkUoX3eDwh72/JDXhmFcyh1j13GkRfsXxEsDvsFPHTcqxjQtlmu90FAp6
+s3f4ydr29qKSDToqH9vV55Wo8XuLYXLiSgstGNbd8HlU6D9F8ocMfSzkmP5fxbgK
+oEl08nHqaOh1y94WiR81bJcmwFylANXcUcGi+G7EEWs8YCP3RWAgDX7PgsBwXMEk
+hz/JZttjUepMmI28FqwgiZH8uK3Mvhn3+rfsP8eShEAQMXXH5yawZ7YQ8Pft/wID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMjgubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0yOC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBQI+vNC
+tl7U8U/eE8JZAfp0hvY2vjANBgkqhkiG9w0BAQUFAAOCAQEAKgdvPqGaaxdHBPFy
+NOuxxYVz1jiG4oXQ+YZ6Opj6LC5aSNh4nOpShhPzfWDoejWXw2Wt0s1h9OURpuRm
+n0/G0ag2QL1a/WGgloy6whNsOEaHvgpr6QsZ970leWJ5hRcLeue0+W0MVQDXZCXl
+EKbVnSb5Cd6Es7fHo3SMgP3Auywxs/m3pwK8B7O9Y2VRWplb8yHrEV4R+vVojIt6
+ZdMIZRDEBil2jSxvuYO1IOeSmHOFyjnF+F1Mg3jyCslNwFvaevqradN7bKzNbLi9
+RI4pzDvFzvIkXilerHl6u2qGp6aKoBFnVAtGLfvGGeBzj9IqGxkHuumuDVd23Fgc
+iKCuBw==
+</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-28.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-28.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-28.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-28.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml
new file mode 100644
index 00000000..dc09f0b4
--- /dev/null
+++ b/swamid-2.0/ladok3-28.ladok.umu.se-student-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-28.ladok.umu.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-28.ladok.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-28.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-28.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOS1pugTbTi9MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yOC5sYWRvay51bXUuc2UwHhcNMTYwNTI2MDYwNDE0WhcNMjYw
+NTI0MDYwNDE0WjAhMR8wHQYDVQQDExZsYWRvazMtMjgubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyy7dtV0U9GMxv5JSerUbGNr2
+JZ1D3VAg+9PNf7XfMS8462MQxhAfNHuhj4Yc0eiBP8SFYmuJzmrMp11brVXKG80N
+YcsJKNnuI9qXRBbpMxsSVTpKLnvkyCXlbc10Jwgvk1l1HZmBMr/DTZWrheBij+QY
+c3hwGaOjDgSOmoutPiQcotEWQeAE2d8hV6124+NHcBYyN49/ryAXDfJaTjRcFIEn
++2IuvyG0HAJmgUUPD9Oy77TGDHTIUQqCu/lUawzkPrXNnRZrmNObqj3qE7V2jNay
+79KD2bqvbggqoUfPy5Mkk1MLkcdoTgCkBlWOV6y6AMf8Kgt+/NDdwsm5xewneQID
+AQABo28wbTBMBgNVHREERTBDghZsYWRvazMtMjgubGFkb2sudW11LnNlhilodHRw
+czovL2xhZG9rMy0yOC5sYWRvay51bXUuc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQU
+NlnYPE3af0ymEF4NMudSGH7kXGUwDQYJKoZIhvcNAQEFBQADggEBADkuJexoRfG/
+T7V79656WEBiRL5A1FYAA6clofHzVfTR3i/nvn6ok58ExEqUq4Te1kuY9cTS1hTZ
+ysjgGeFF1QyftVJCnklBCX5BMexfZ3a9cvN32JEb7lO7y14GqtWbNVtJ7yPS/k0c
+k3J5bgLuaAEy635DLcCUE1zTjfpgfuf9SVlBVWs1PWLR5AAXbP3wIWjVyLS2WBsC
+hYXWewWWh1C+xmOGzgV3hPAzcICyh4wQWwSe53T7C1wk/Pb+JeaV+cRKPgt5lujo
+BOOeoYKrAEbeJb487H7qL+Vlk26ObMP7Rhl1f5kEmmPRgZ4zPuoUNcfMe+/uU1IU
+fP1HmPeP4gs=
+</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-28.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-28.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-28.ladok.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-28.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-28.ladok.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-28.ladok.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-28.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..8f190418
--- /dev/null
+++ b/swamid-2.0/ladok3-29.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-29.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-29.ladok.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-29.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-29.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANblceF6P/4VMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yOS5sYWRvay51bXUuc2UwHhcNMTQwOTAxMTQ0NjA1WhcNMjQw
+ODI5MTQ0NjA1WjAhMR8wHQYDVQQDExZsYWRvazMtMjkubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHa6mVTzHgCBTn5WQZcQ7TlA
+damrRKipggCaAbQHvHX6OK7OBJCf/tIMYeSr5W2TSqhqb9nUuqgf/lJ28vZf9J/a
+hiphnM1DovP3RJM5dWOGk7lIm5hErcCAJSCPnI+GU1NRBI/0F5R2WukSA0Qg/Vw8
+s1GqcTSdEWISbvHZCgsthRwLaAjSWdy/YE7ZO8wgvqHT7/ul80lq1N6RScs/iZho
+ag8ujgTWu9K3dvURv1bXk9uQ2f2OIpxd9/QXZsTTVG9iRmofKVQ8Rl/MQd1CePza
+0m7qJfbA1g+jM0A9XdBYDbqQOTywUTCaFR7dqN7Dtr4sB0HjXozctHDd3enr5QID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMjkubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0yOS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBQZD1zR
+Aj+xhL1D8tFSE35BDEe5HzANBgkqhkiG9w0BAQUFAAOCAQEAGoMqBaO9B28ix73O
+Pdm5p7h8XoIFpCt24rsTm4wqe5Z2a7xvjQRZlDMcHjkq284jfq6gzXJBbK0XYR1E
+PsrZ32XlD6/5MyvmuH/bidRAHCnks+pClIa+f5+mil0moNUq7L/nZ9/ez1xQi3km
+vj1ukdyHWuN4Ur7raO8ln/+P6/inamK11WGC2krYGXEkfeejyteHnwm7SCpft21S
+qTSNDt/Ow3f9v/W/jq0Rhyv8xxsoV1Vh0HhkLZ11PFp6morLgie1vc0Nm26D/sYQ
+yh6ikEv/JrG6qAMbW5lwEtQW/evNHW0gbgEUG5gSSa/R5oudn5H63W6Hzd/s14lg
+O7KVeg==
+</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-29.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-29.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-29.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-29.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml
new file mode 100644
index 00000000..a485ddd4
--- /dev/null
+++ b/swamid-2.0/ladok3-29.ladok.umu.se-student-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-29.ladok.umu.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-29.ladok.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-29.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-29.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAORZYviAWNOBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0yOS5sYWRvay51bXUuc2UwHhcNMTYwODI5MTQzOTM0WhcNMjYw
+ODI3MTQzOTM0WjAhMR8wHQYDVQQDExZsYWRvazMtMjkubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqU2jLNpEHZH7nxV0p7OqZsyp
+r500DSCPQMJTS0rLON8U9vIji36YMMZMUuUxlyw8qcY5Wf5im0FV8GdMEocTxlEc
++vPKxeHxUuVqewGg+tucN3V0E2juF5aHgQbkiN/Y47VYLNBGMWaTAfiyfTpiYaYH
+5C/JA55uy1TjdLIQsbLG8UjApOoTz+lsmA6/Jo5cNwCQc7CJQUi/OOgtayWn/Ct/
+2WOxmKMTamDHmcKlnupAlGx0S7n/j/+lXSFKZmREtrvQXIPhl6qa+Qn/OoHWNDOl
+ah18oWY7wpK0U8BTlujFPvcHUfJwSA6cxCX6UwLGm5JDj+8TFsZdR/r9/ZNGnwID
+AQABo28wbTBMBgNVHREERTBDghZsYWRvazMtMjkubGFkb2sudW11LnNlhilodHRw
+czovL2xhZG9rMy0yOS5sYWRvay51bXUuc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQU
+5c5LiIQtXsFmLCY2n17sN+a9FdswDQYJKoZIhvcNAQEFBQADggEBAIDZ+tJ6iyjA
+170KHI5RcvGpA6f8rF7bDES6ATSK3PRR5Dn3OkpwHDJBqBbxj4ME5XVgWciCbliz
+jnesGl4Y4diHrKC/+aI8uxKxaEYPG0pIGuXeDB7QKwoLjfhcZwltrA+9tBobE2p4
+O1oVKdwSL6aq3xT+0vRJvKdU5ZbvySxYrt0ahA27yHpDG0MwkpExWmq+lVhQjVkb
+8nz3aZhhUCUFf5MNNQ6+ed2cISEBDIiCSpItkufKnLMxFr7YuH102QSf255w7CIH
+Vzaus0EAtRmkmjaySz3TZlNLp4QeJfwlw6hvtL4Z52nBw7zLilrv6gYiaX6uPJkQ
+tItXTrgKbqA=
+</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-29.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-29.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-29.ladok.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-29.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-29.ladok.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-29.ladok.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-29.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..d22809bd
--- /dev/null
+++ b/swamid-2.0/ladok3-30.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-30.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-30.ladok.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-30.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-30.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAKtr4Ek9wVsGMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0zMC5sYWRvay51bXUuc2UwHhcNMTQwOTAxMTQ0NjA5WhcNMjQw
+ODI5MTQ0NjA5WjAhMR8wHQYDVQQDExZsYWRvazMtMzAubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4KxBwveEM07WfS2TqImFzQY7
+z5u/OyYNha2KkhmYBiYFOv8CzfrsKeq2oAsArexamNP2Vrt2npoTL4GuWgmqybqQ
+B2A6hOtYerUmUTmVVFNILY7MjF67eRFfA+Waf+Yot21qq88DH8QRUfYry/BR91p/
+pStJkZr5ELtIoZs03Nuu+csNDPCse7vjCfrsPt6waZDIjRo4a4cD3YqwWX1GMiX/
+6adFUBx3TUAqrTVT2mNyRatBOSQb9QPLNtrRCrK/EpZjfDk1kgsyF/gpeEem7Vlu
+NJEot4RdOqp3opcqMoEeXAmxU8CRQjaEB65hEiz29HD/rGwGu2RVZdtRZRk8OQID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMzAubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0zMC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBQyHMO8
+FYZqZKZyuoGkmWpqrCmGnTANBgkqhkiG9w0BAQUFAAOCAQEAuZz+l95A6y5FA2l0
+RCaBnPKocqagsasu8P2TRus8Y5rxnel5CR+kLgbQnohIkQkFn7ScalYyxo17SU8u
++3Hw2YiJSnSAFXf41DksFM50lXRIlv9pKApiwLZ7MfPkiSzXikPboZr1A64sL/Sh
+bgiMMP+shfAs2AcEAIDNGT/Xtpu94xShWYdANUrOB5GuGfp6XHIPjiOZcPymLqH1
+8gjF+JpOoqIiDvxhUgC9VjcxhSjz/tdrRLFOizDHIk6EUkVYgvuRakiBo5rEukNz
+QTCLmRjDhMIjWh1Sg3kG824Z2qD+96i8zoGm8DC78Vu/JWUgkOaJMGst3OBgg8mj
+M71yRQ==
+</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-30.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-30.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-30.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-30.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml
new file mode 100644
index 00000000..11fb0919
--- /dev/null
+++ b/swamid-2.0/ladok3-30.ladok.umu.se-student-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-30.ladok.umu.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-30.ladok.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-30.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-30.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJANCdrKxGX10cMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0zMC5sYWRvay51bXUuc2UwHhcNMTYwODI5MTQzOTM4WhcNMjYw
+ODI3MTQzOTM4WjAhMR8wHQYDVQQDExZsYWRvazMtMzAubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzapPHOmYwL7RwIg6j2QhxZuW
+B6GN+Lyfc5UqchpvzZWRM69h/RKULgpgXwvYQqff+h9/mCQfld0qLzvVkA4Uqi9i
+8cn0aeLsA1UaLMuHmPLixnekqpzb7MAEX4jL9ImV83hUXZqJUSRCCtMy7xQlwrCW
+U3fi2z4YBfCvIJZWyQBO/09qOTA3NQDp2naCXMDDZJ8AOVjUdwn1Rp5FI6687dng
+q6OJsvZUacjYBt87e7uMvKfMDLYsO8ZskLelnBzvEPhIU8/VwalqDpOrHmbOGGwJ
+istBttE6Vpeli5Q1mVtNv7LbmzIm0nXP1/ASg79D74VXVZDh02tzB9AQqMAWeQID
+AQABo28wbTBMBgNVHREERTBDghZsYWRvazMtMzAubGFkb2sudW11LnNlhilodHRw
+czovL2xhZG9rMy0zMC5sYWRvay51bXUuc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQU
+9NGrRdojmy+sJ1JyczvEHRAqhSUwDQYJKoZIhvcNAQEFBQADggEBAFNCRyQZszNT
+/9cmpOnTYkEa8koRix7WXqikEWyH8Y6fTbYnCXWk27pE1/mzrTjl9alUmC3bUsvp
+XN5/afBCtuolWBatylR6u93hSnw+UoeAnCYN2T3vrkulgSl0UywSTJlXLNXG5UAo
+BvRWM6Z89KN9i3P/IZybMF3+D/itkylHSlUW5wLS2x1EjyzI9SylifdqYFaMXqUf
+hZchzXKUCALVS/vfUQOfXV/c0X248wQLvIdWA1g5qGAnBITpi5H1yDt//Z+tisL1
+0WUhJ1/Q00fUPqeWH6jKKMhIsPW5afwMjOAMajXBpooWwLvJP7gZaN78O9j8UaIe
+L48gkLjk0N0=
+</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-30.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-30.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-30.ladok.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-30.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-30.ladok.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-30.ladok.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-30.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..00c96ca1
--- /dev/null
+++ b/swamid-2.0/ladok3-31.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-31.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-31.ladok.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-31.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-31.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-31.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-31.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJAMANRMVlii5kMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0zMS5sYWRvay51bXUuc2UwHhcNMTYwODI5MTQzOTQzWhcNMjYw
+ODI3MTQzOTQzWjAhMR8wHQYDVQQDExZsYWRvazMtMzEubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtZu28/KIQKpAhyYzThmm7UAG
+Tb3qBvsuMBrX3FW9XmVlhAu6PI3O8OZ678TJMWXBNIk3ePmulp3GCozAmVPNOSG9
+zq3WlaEsM0jiPrM6rWRZYJViAynU7GplnTyxKqRESWApR5XODLzZIbLSwz7ngZys
+5XUFj1LPKNcwxkgoHRShRzxuN3u6piPEMg6nnbJQLOnKAZJNgvKOMXhlYmb5aNG1
+I/8kY5QN9G1f4jIRmGMS5lAov3Vhs/i+ltFRF98j6xI2rx0jiY4++EU9S2mekCzd
+CXytNVgV9hm/WhHbBflUivzkTbgy/mWSy+45mIONF0oYcFhrkG3MbrmmKQafnQID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMzEubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0zMS5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBS3K1o8
+T9q1IIgP49cN/+q2QZYthDANBgkqhkiG9w0BAQUFAAOCAQEANSMsP+Rz8zpuDEan
+0rm1GLz2s90EwuemSx34gNPml2eXJZeB/AKNXD6plBBzbTDKIj92tdiMawCxUUlb
+mqnkTbuC5YD6fYCWNkHvJyQOfkOsSNYzggHEXvrMqZX2qlrmckASPwQbcVBWzncB
+ISrU+geb3Derb6HrMUhWaoHZFWt0RBgFjkrYaj7rRcKXjXZ5ZX6B5gqvYKhFmmXN
+YcA7tNQQAdFB7NNBYxe6CpTngg/cqLEUSTr8S/2ubB0S9hu+i8zXfnsR91a4xHPJ
+3aW2wcQDYPQiLhafvygmmPnaSjDMZtk8JScXItvrp2xBZkdyxnJ8S+J6FRR2Dadb
+pdsPjw==
+</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-31.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-31.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-31.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-31.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml
new file mode 100644
index 00000000..00ab623b
--- /dev/null
+++ b/swamid-2.0/ladok3-31.ladok.umu.se-student-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-31.ladok.umu.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-31.ladok.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-31.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-31.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-31.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-31.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAPtDYSfwzR5TMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0zMS5sYWRvay51bXUuc2UwHhcNMTYwODI5MTQzOTQ3WhcNMjYw
+ODI3MTQzOTQ3WjAhMR8wHQYDVQQDExZsYWRvazMtMzEubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3EJybeULhJ5De9unN+rSRVZl
+1b72u1p4SiSWQ1MKUgvdQzwV/bfuwK6j4jN+hkB0174pJF0ZpKTeTIi9+o+vfrAB
+FSjMZ18mguX2vpAobhifTl5keI1W9/dNala2loD2UiXjiLtyAId6JKHmo/7infv+
+qUnXtFr7nsfAkF5Dm7TMh0kzhnqxJMSadYplDEwwoA6dyiijt5Aq4V4WkssA0e/v
+1rmnNxaZ1Tt63ejGpZnXis5+7TuQkS989Mm7xKc/q6cdHo3qJhTcOJjfXCVdndmg
+y20fPUqOx1aK0pMd5pLmTBarSV97U7wyERBgoFaFadmpGf+65k2DSJyEkOUI4wID
+AQABo28wbTBMBgNVHREERTBDghZsYWRvazMtMzEubGFkb2sudW11LnNlhilodHRw
+czovL2xhZG9rMy0zMS5sYWRvay51bXUuc2Uvc3R1ZGVudC1zcDAdBgNVHQ4EFgQU
+syDyATLwTlotz2UPxHy5q1xDdvYwDQYJKoZIhvcNAQEFBQADggEBAF4j8PATisoo
+W9Hxx6SePl3YjzDz7HO5KlqWqqwvhbpZKhfz2oI2td416Xb02iHgCiVJLdPlXzbo
+WkpZ/w0XFKPGUO3E3UmoqF6s7VA5/6IfkQIZN4EoSMiFJWKR+yIRq1NbKQZt+p6c
+KOjeQiiowCPGb+Av8xgJ3DAtMsgeap+HhALjpCwATxsHuLxomY4f6l1TavCPqnEP
+/hvb1xmI5WymsJizPlQj0/y3QPwnIyDwuETo2KrMPJ/YIUo3hOhQHOBc6rTovxRo
+WsMSoXrYPmqPrytJk8exPD5g1E1VToc1MNtL+l80q7kljBsxW6GNVRQ5VePvxURo
+ARkFLPLbS6M=
+</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-31.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-31.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-31.ladok.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-31.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-31.ladok.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-31.ladok.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-31.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
index df593719..2416eda8 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ EeE68EA0OgCl1QP8GuR3llSLtvNsQS1JI2+LMPuma6sSEr1nQqwuZgZkQm78bygF
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-00.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-00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
index 2fce0806..d3406533 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-05.its.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-00.its.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-demo-05.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-05.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;demo-05</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;demo-05</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-00.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-00.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-demo-05.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-demo-05.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-demo-00.its.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-demo-00.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-demo-05.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAJbNz2Ut6PxqMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2xhZG9rMy1kZW1vLTA1LmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ3MTRa
-Fw0yNDEwMDQxNDQ3MTRaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTA1LmxhZG9r
-LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJbIXoy1e4DO
-hBNnvCRv/k7Av6fxBYikDOzLQKJbtibVP9POw4fECon7c3GRiyB7lBUSPrWLkVM5
-tad4QzjFCzK+t+Wv2VBnDb22+jTPM1epyfEg619hbhujr54iFRCoZkbbDA5yQg7/
-xQsjUZT9jMZoFfKOb8AwwOtd6yUhpQmFxRyMUDgRYqOFBqu65V0zSiYuAr93e5IS
-FUDkwvDjuQP8AOf4bfvZLFepkYPELSLN9mw0+FMyWQd9LnyvKPqG32r95CpIp2ks
-f6V8uXiiLE+ZGB2WzyF4pNhyUH2nNVWIhdsOV6x4/td8oae0rAxLOcNJO2zmU44S
-gqY8LjrEc+cCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wNS5s
-YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDUubGFkb2sudW11LnNl
-L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFAzHqhqAykN2wf7NNTovucpa
-Hy8TMA0GCSqGSIb3DQEBBQUAA4IBAQAFAyn+Snc7l6KHh2kDtnpUOCfKbNtx9ALu
-gnh6ltcDDZHoxq0jQNIbQNGqzdot8esoPYntY8IWSsUjZS7SxFw5x5l+/JGIrBP6
-j+zHauVcWgXgChfR2OL+CwFh979lXZniUsjVHXBhE8LxWs3IXpOmCAxY0f2txi6S
-C7InYFK8vlTWsgGvZY4gV7RjTwP8K5OkBrg/rtd3DQa67kQRmu8kAXaJboPabTUv
-ETztMh0s9VwEVBPMUKyTETLvUVEnKijUC3XFHn6QB7dKc4K0MEseDwHklMHD+a4+
-XVpEXBWCzSEzde1b1UN1OpTum2X30RmEij8IrqvSnV9rX8RXu9zA
+          <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:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ XVpEXBWCzSEzde1b1UN1OpTum2X30RmEij8IrqvSnV9rX8RXu9zA
       <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-05.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-05.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-05.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-05.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-05.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-05.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-05.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-05.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-05.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-05.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-05.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-05.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-05.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-05.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-00.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-00.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-00.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-00.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-00.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-00.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-00.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-00.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-00.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-00.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-00.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-00.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-00.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-00.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
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 8e0efd2b..f1e85c22 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
@@ -92,4 +92,19 @@ UiWyXm1zkG9otie1FBOVIQeZ5GKf3qEgfphkTBcigBCHKMxrDFOEjr9WlZEX7UAw
     <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:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </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 17e62c51..03f4e975 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
@@ -93,4 +93,19 @@ doapb4k+1TzJZ+MDX6jwvVMl0DN5+rmuHjkmu75L+UERnVJRSbIK
     <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:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </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 9bac444b..f1731a44 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
@@ -92,4 +92,19 @@ a/lggwDHd7eCy/34Rs5nJw==
     <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:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 3b01ebf3..00000000
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-02.its.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://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"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;demo-02</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-demo-02.its.umu.se/student-frontend-sp</ds:KeyName>
-        <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: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: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:SPSSODescriptor>
-</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 5462b0e5..fd9833e1 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
@@ -93,4 +93,19 @@ sfAksU5zX5TLN6UmXQeW0u0pLpk4YCOXJJ5mX6E=
     <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:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
index 0583361f..7b4e9f81 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ b/vkajQh9nHWAfPhgIOgkQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-03.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-03.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 407c85c8..00000000
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-03.its.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-demo-03.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-03.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;demo-03</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;demo-03</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-demo-03.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-demo-03.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-demo-03.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAOgVT0mSkmI0MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2xhZG9rMy1kZW1vLTAzLmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ2NTVa
-Fw0yNDEwMDQxNDQ2NTVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTAzLmxhZG9r
-LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrCNs3pcU6i
-s/gLwcSclyG1xVnkFeFWD6rsmV6dHCFPq5u19YWTEGl/X3WmyZqSAb0ejPMxpy8V
-PJCoY8C+OkFmdwQurOoKfbdbnxjUaKeeP2WzffnpvfuL0LuvtMd1UdRnfNlRQ9el
-68NoY7YWlEJu4B1w1WPY5KhEc48yWdNj8AgcklbjP/TKycKDe+1g4GAp+WU+Gcxd
-681GUeAWWXKIqUVJBLCREETpytRTRMKUdE9VV1CPrl4PdGrndSxOAHgfy18KO/mr
-psivMsJfat8giGmr6ybNBjDxx7jMndqahaK+/o6n5xxAI07Kx9QGcdXmewX0cE4n
-Oxf9oyixteMCAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wMy5s
-YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDMubGFkb2sudW11LnNl
-L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFMz0MnV1lmCpi0zSus3h+Hqr
-rk+SMA0GCSqGSIb3DQEBBQUAA4IBAQA4EwmVC3KoTVliA3AZcCE1lJpyL/qGi+zr
-5YnPebi4Sf+hTxUS6diFGT2Eh0FSvN6omQ2Zryu0CALKXb6t1ieV+dymNy/3+T6I
-75fmCt2Mcju+YdQPiy2glRnTVsy+NL3s5RfujOK2Y/6JkC1T1bhkY8q37vXy9l0m
-VCquud3+5bD/wfYkSrbL4HjwliXohlAGXy5BtfNK6wg6bHSTuHO/T+yjAAF15kFn
-rTIw0vdVAMr/ssruViMKF91ztRL1ABMxhvn2OqUPW3kE7pJDw5+lDjH6NDeYcph1
-9sW2iFgVmATh19bE+JPlWOV7LHo5tDD0wnoy6hUKxXyEa09wUUlh
-</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-03.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-03.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-03.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-03.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-03.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-03.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-03.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-03.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-03.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-03.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-03.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-03.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-03.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-03.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
index 30279075..229b2750 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ rTIw0vdVAMr/ssruViMKF91ztRL1ABMxhvn2OqUPW3kE7pJDw5+lDjH6NDeYcph1
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-03.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-03.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
index de25c6a2..20783657 100644
--- a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ P6m+IbDWFLo61vhr/Nkcmw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-04.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-04.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
index cd818ccf..b60a7e9a 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-01.its.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-04.its.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://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"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;demo-01</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-04.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-04.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-demo-01.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-demo-01.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-demo-04.its.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-demo-04.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-demo-01.ladok.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:X509SubjectName>CN=ladok3-demo-04.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIJAPHLrm544TrtMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2xhZG9rMy1kZW1vLTA0LmxhZG9rLnVtdS5zZTAeFw0xNDEwMDcxNDQ3MDVa
+Fw0yNDEwMDQxNDQ3MDVaMCYxJDAiBgNVBAMTG2xhZG9rMy1kZW1vLTA0LmxhZG9r
+LnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAKhZKGleLr
+BBVLrxstz92yRYuBi8s8Ff3lFRzJs4BqKB8m6aeFbQHQMxUqTyPdmMOZJVaw0s1z
+jRI46j9iR1flcPjNDB17SNKEl2pM2xVChj1FxSb6GTVDhaj0FeWKQYiB8TGQTGVq
+/dLdvh6gJvt1VPU8v22REw3CzX+8LvyqcbHoYCkdGyc4dDVB8kR2tl+X3wzCnHY3
+m84kSPkRpy+NMfjTQv0yzPQ55WvBDQ6lJfbcOm7vHHdBrJeDX75G/A0SO9JKD//V
+1GomzGDSp8UndVZrPtooL4Gig7b0W72eLybMWdFhYXsyiDAIXST6avhV4d03+JmU
+NHNsU2M3aB8CAwEAAaOBgzCBgDBfBgNVHREEWDBWghtsYWRvazMtZGVtby0wNC5s
+YWRvay51bXUuc2WGN2h0dHBzOi8vbGFkb2szLWRlbW8tMDQubGFkb2sudW11LnNl
+L3N0dWRlbnQtZnJvbnRlbmQtc3AwHQYDVR0OBBYEFCYCsuDjvCxZmjYdCYVzbDXT
+KlBWMA0GCSqGSIb3DQEBBQUAA4IBAQB6R4AmByTBgOqwVw+HDboYWl8DsXvH8tYo
+AKVkg/A81g1YXczlP9P2zQNMLAUJ8KmMWJ7uSsclg1VJzvtwrWCwBDbQ3tibK685
+qaxxcZk+nk+7RiwJqiXuY4rH0B4y7AgjI72i4mzvnJMcjc6fC0sYz4O1ZtnaOHA3
+t+v4iZGPxWw0mS8IWHlO8ss6OnMFeeWWThoxxMqK5qeFIxL4iMEOv5Fn3dNOraFR
+H2iCH8EZRly9upkcAddBIwR6d6yN9QdGehacPFA4jPZ9wXqTcYv/2Nt5OOv9fdNw
+zqfsY5dOVVVlGXOm2d6Tcg8HjBGWn6oo0ZUZGL1TI+XfHzGRnLgh
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ 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-04.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-04.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-04.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-04.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-04.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-04.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-04.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-04.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-04.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-04.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-04.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-04.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-04.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-04.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
index c6c35bce..62532a51 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ ujZI0vVtQx+sTGMktkMb/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-05.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-05.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
index 1021d815..0a6ff552 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ XVpEXBWCzSEzde1b1UN1OpTum2X30RmEij8IrqvSnV9rX8RXu9zA
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-05.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-05.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml
index f0d748fe..34c85ff9 100644
--- a/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-p00.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ RjGy4hnZ0d0E1vkLI2/F/uLaVuE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-p00.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-p00.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p02.its.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-demo-p00.its.umu.se-student-sp.xml
index 929a2fd1..e439e463 100644
--- a/swamid-2.0/ladok3-demo-p02.its.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-demo-p00.its.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-p02.its.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-p00.its.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-demo-p02.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-p02.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;demo-p02</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;demo-p02</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-p00.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-p00.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-demo-p02.its.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-demo-p02.its.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-demo-p00.its.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-demo-p00.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-demo-p02.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIJAPCiY3IS8HVbMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGmxhZG9rMy1kZW1vLXAwMi5pdHMudW11LnNlMB4XDTE1MDIxNjExNDk1MFoX
-DTI1MDIxMzExNDk1MFowJTEjMCEGA1UEAxMabGFkb2szLWRlbW8tcDAyLml0cy51
-bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS+FfC2UkbJdtC
-azgygjVbWrdTV0m+eSjTi5VfheP0WWJe9dWRy8j3n//aqlPkj60gDsSrkWi/rtby
-19+rDfTWpCWD3h1D70ux3yMs1KWvIbZQlHsu/HLbizeS/rhF/AEKPNJsk4U/v8SW
-wOGqu9M4bkXuFxQSvZlPdRhkOdWXlKYmlhlLo85xv9yVJjvuxv+zxGXQaP5vFB83
-jNqP5HalZmb8rOkLwp5CVlamvSt2LSU4jwllkGSLRpfBMN4A3v4geBh7E8wkdqvH
-3/Q1ab5n2m5wlgDyIbO11XtKrU13vJfGECuTXbD7MUuGcY2yL9YbjRbdSS72Iizm
-VaXy/GOlAgMBAAGjgYAwfjBdBgNVHREEVjBUghpsYWRvazMtZGVtby1wMDIuaXRz
-LnVtdS5zZYY2aHR0cHM6Ly9sYWRvazMtZGVtby1wMDIuaXRzLnVtdS5zZS9zdHVk
-ZW50LWZyb250ZW5kLXNwMB0GA1UdDgQWBBQzAAruFz9ub6BSvXemvLpUrz3TPTAN
-BgkqhkiG9w0BAQUFAAOCAQEAzOD0qVApYCrFimtnVsdMNNzMp6aVvIkFiilEFi2O
-pXJP0lVDEqkKAjGVXCaGPDjh440cV7cti8J3ZRzGiBQnpzVn/Er8HlvSgZR1Ycna
-sA2B9+PSOdUGhmUs7Ec9d8g0f2Zc5OTMgcAA9rHD+YHpjc8IScJ1XJqprTO3Yy8l
-z09kl0PlaF9QVykdg9seYN96Iyycld5uxQhEOWlFd6dHkXY59yfhza/R7FwoeMew
-uDWwlfOf6tW1J+ovIM43YkXE4KbwIUhiwdPR1oSnkUn3+4naKYwC/eB9qsN8B38B
-PgRf9awC3vDMvS6jY6AqIn9r2KPVqV4TWqBvYG0ARJrG+Q==
+          <ds:X509SubjectName>CN=ladok3-demo-p00.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIJAPeXSFgrRGKOMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGmxhZG9rMy1kZW1vLXAwMC5pdHMudW11LnNlMB4XDTE2MDEyMDEzNTEzN1oX
+DTI2MDExNzEzNTEzN1owJTEjMCEGA1UEAxMabGFkb2szLWRlbW8tcDAwLml0cy51
+bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEHdgYz9lyIDrn
+fIQIvxOcZtJBUtRn84VHxe9e9twoikJaxEf9v6O7esNM4Nj3njlJqrwZ1LgsCGm8
+SmZMNC+LClt6JsPQnZfO6vt544PAnJB9v4dQ2Rx4N1DpHxPvcwwlwHqepdnrOl6Q
+R/oV8bS8WE6ZJK1tl90b9O0KwmpYb1C6EdoJvU+6kNgPdQvKjHis8rGN1CT7mxla
+Q0ML5ddfGVjCpbda/pewzS3VkrUJyok5g09vpX14aSTpYGwptvABBHP3iv/AuXQO
+f0HL5XI+XdnkWbuXabshJ2CpwB/nEXxP8DcO+KwyV+YwI9Z+1xtM3vwhUHzyJiAO
+KSoeFLmdAgMBAAGjgYAwfjBdBgNVHREEVjBUghpsYWRvazMtZGVtby1wMDAuaXRz
+LnVtdS5zZYY2aHR0cHM6Ly9sYWRvazMtZGVtby1wMDAuaXRzLnVtdS5zZS9zdHVk
+ZW50LWZyb250ZW5kLXNwMB0GA1UdDgQWBBQUp2BYeiePgn4pW9kM7nrLZX/fVDAN
+BgkqhkiG9w0BAQUFAAOCAQEAu6rBwJSKfO2Z2r9x7Q0ylodLKy5H4F3Vfif5e6er
+kfK4HTFbY2su6K6NfmFh8smVF8Ska355Pt6y2ar9s/qujF73hoo1juuMvqp/0yJ5
+SKewtpj4YkPpMkUurTPVPFzGf11fbDJM3KgBw9lIaOPglpDuSDnCwsnY6bxBYKEL
+5NHl8NWtr1sbO+zQf/8/pP9qOX/nkGp2rVsxRddOdkZMfzPmz1MUkqSaP/DcleFN
+FbwQUTpKrkomhWr2L2pzY9av2BpYyBniL7t9wPDaJMH/nn3JKXLkOEeB9SkUO2OF
+amPC5F4um56p3wnuMyvTs3oRDfx4fOh/Kpt5LSK+UhYGHA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ PgRf9awC3vDMvS6jY6AqIn9r2KPVqV4TWqBvYG0ARJrG+Q==
       <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-p02.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-p02.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-p02.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-p02.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-p02.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-p02.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-p02.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-p02.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-p02.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-p02.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-p02.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-p02.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-p02.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-p02.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-p00.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-p00.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-p00.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-p00.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-p00.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-p00.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-p00.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-p00.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-p00.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-p00.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-p00.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-p00.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-p00.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-p00.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml
index 86066d53..3bb9b5a5 100644
--- a/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-p01.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ d6zDyVH57UjisqGw7DbtNJ7fwDB6eO7QoIUmWfu7PnjOs4qzs1sSCkulJ7AYM7lG
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-p01.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-p01.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml
new file mode 100644
index 00000000..646f730a
--- /dev/null
+++ b/swamid-2.0/ladok3-demo-p01.its.umu.se-student-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-demo-p01.its.umu.se/student-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-p01.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-p01.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-demo-p01.its.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-demo-p01.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-demo-p01.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIJAIAAV3XEQDkVMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGmxhZG9rMy1kZW1vLXAwMS5pdHMudW11LnNlMB4XDTE1MDIxNjExNDk0N1oX
+DTI1MDIxMzExNDk0N1owJTEjMCEGA1UEAxMabGFkb2szLWRlbW8tcDAxLml0cy51
+bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNXeRi/lG1XWnn
+ydv+FwiLQG/cf84DElaud4bQav+T94yfFODG77g6MFUbjOs8F1c5oLnHbNjabTtB
+BsFp2/LGoRLw8/xdwcNT84K8O2GyLqL5CkP5ztNVeVMxkmeAQtEXhfonhaFZmRyW
+4vytFmh5gKwsOJgF38tbKQRCRigCv/iT8kaKlMeqzQ3AkkJ6KfAANGSc86NUK4VV
+qnokVitlrLz1lVp86NASA7DTEH06OAxAIvaHhrzeCakYFrsNj5HKjAaYrQU+U8j5
+0co0QAx+n9EfKAFF8CXGyyn4b8KXfRMlch6Ox3wxE9Ipo1dxglMiu87rps8PktN6
+wmTwG0vBAgMBAAGjgYAwfjBdBgNVHREEVjBUghpsYWRvazMtZGVtby1wMDEuaXRz
+LnVtdS5zZYY2aHR0cHM6Ly9sYWRvazMtZGVtby1wMDEuaXRzLnVtdS5zZS9zdHVk
+ZW50LWZyb250ZW5kLXNwMB0GA1UdDgQWBBR2LjHUtaeuqioF+S6UBbKS1HzzODAN
+BgkqhkiG9w0BAQUFAAOCAQEAsUi9DMICTTa5GPr33dMOMVFoUKRWCe2myApOQuoS
+1+TZCgcPhC5u0jWkzGDR6DlKoUSvmzSil74UTQ9T/vULP5Ocbq9I1mY14N9oYIzO
+sCkJu90cda9Qx7wEO2M9ujPQFkJ3HgkxinuVThB/Zg6ssleOIGPXfJEQqguC1iQM
+y6YbuLRYz/ue52+uaNDcrgT5Ga+XSWBg7PhapeZmq8YnGm20sH92nzjT/naw2XJY
+pKgOht+Mvdv1n47sVgyviqEwQ4lB7f23jtW+EABwVPhRZQ6SluKgshKsl/ZoOD+g
+xFmPKbYpiGoCWQ7zvdrC/dZEdncQ/lEafxHMtb2sbqwEBQ==
+</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-p01.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-p01.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-p01.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-p01.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-p01.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-demo-p01.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-p01.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-p01.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-p01.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-p01.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-p01.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-p01.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-p01.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-p01.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml
index 82858b19..f3f272bb 100644
--- a/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-p02.its.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ jIEOnms9HH1cMiILW2hUwDoRlWn2yViby40MtNdAe4EIXMSKir5EFTdl9QTg0C81
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-p02.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-p02.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml b/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml
index 0c232146..1d1fb50b 100644
--- a/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-demo-p02.its.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ PgRf9awC3vDMvS6jY6AqIn9r2KPVqV4TWqBvYG0ARJrG+Q==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-demo-p02.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-p02.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
index abd6ef18..37e24f49 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ vt1mkOs1sbw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.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-p00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml
index 4de9c197..d3edff94 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p00.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ UEpDZ+oqJxcdV7QpvC9PesO5oSvH
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.ladok.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-p00.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml
index 815c8d2a..694ab93f 100644
--- a/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p01.ladok.umu.se-gui-sp.xml
@@ -74,4 +74,19 @@ W3uPBzrXf9k=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p01.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-p01.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p00.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p01.ladok.umu.se-student-sp.xml
index 858f6720..bc1c49b8 100644
--- a/swamid-2.0/ladok3-p00.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-p01.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p00.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p01.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-p00.ladok.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-p00.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p00</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p00</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-p01.ladok.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-p01.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p00.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p00.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-p01.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p01.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p00.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJALxPd7mRqLHWMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDUwN1oXDTI0
-MTAwNDE0NDUwN1owIjEgMB4GA1UEAxMXbGFkb2szLXAwMC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5eQWoo0jvq5ezBDlf44cN
-sbWxAK+OkxeRrIgazZz3BgFO7F+RTuEFyWbVCuwjltGqhugKwXWG+Sw6hK1HCJh7
-7EhxlXiiFZjsl0UYIvh4fk2YDSHnFX1gvF/8SvUJ6y3XXfq+NFcm79wbw7JCcHon
-imO50gTfcX+f8vOEmx7T39vdCMJinwZFfgwdSAgKI2u99hF7Fh6MoREL69rWtOn5
-SMKu6aOMz61fxI0+mQw0YPpdix0z8q6qTgfgWa6q1TXo7a5hEvooCXbfvG0EcBt9
-We59FKDHqOco4q8O7W/+CfTh3chrqvIgd1ySno4PUofrQpZx43U6jPUwIppDlmq3
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDAubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMDAubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFPYqHe1zEaIMRzs3f0sxAtAwo7lwMA0GCSqGSIb3DQEBBQUA
-A4IBAQCvy0qQ/FqDy6C1g5ECxZViC8/VPRBKnlnVXzmUWSjbF7KMTbfsM/LXKs2z
-yqtu4vOZ3HjUyL8ZB0MUhvBRZZKJEU+ybkNRll71Lmi7G7pjF0lppFRNt0DIxQ4t
-B3ZmRqC36gtRXx9Sw3utpX3EPkUDh2ahit3dqXBF2befvQRgXLo6Bdcy0+2t1vzm
-oIn5DFz+1jZCpTHuVuRKNJPVuks8RWzBV0QUgeiO9vzg8JMbyDJx0DU3azGuNrBH
-rJDif3ojo11aT4Nrn7xehC+cV0yIqTFPNiAuZ/MWyDUBH5MIw3blavnllojr8+PG
-UEpDZ+oqJxcdV7QpvC9PesO5oSvH
+          <ds:X509SubjectName>CN=ladok3-p01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJANciKVqNKiI3MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMDEubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDUxNloXDTI0
+MTAwNDE0NDUxNlowIjEgMB4GA1UEAxMXbGFkb2szLXAwMS5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSJAJ8/i+nnUMIu9jstHJT
+Kfbqmm5xJQJoBwQ2qDj2Uy7dlfIrFrLlvIGWxkD8OEZjOzOlD51pnAj+X8puN7BB
+4Kf0Xnpcj6T2HefjYWUg+QsH6eeEURYerURPx5XLU7GzzJMabqAavMo9p5FAg59i
+K++QdKU/8nQl6L1YcSallCjx4tqEfjlwl3uCoiPSQilSbyCnryKdn5VSAhL3tS/4
+FOsTNS/PDSiFAbpFiFmzViFVCP1Uo4sW8qGZvBALa27poDQ7V0pvvV3z/1m0yZQx
+1kcVn5cKhxh3EEUkdlx5BusCfTM+iMpcID+T1Fti5kzV+WjVKQLWlXmJ6pAQ94jl
+AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDEubGFkb2sudW11LnNlhjNo
+dHRwczovL2xhZG9rMy1wMDEubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
+c3AwHQYDVR0OBBYEFEWGb87ZFJyJ+zTgc5rGIkdS74ONMA0GCSqGSIb3DQEBBQUA
+A4IBAQAbLWn9AEM1YnXU0isYFkWe09eG4Gg2yMuBuU0aeI+M0JPYMoh2y48xK1vp
+1GoOvGojjEezn1SjBR+QUF7Y1GMzkBH8nj9rVnN56UuG7DZSPmNrxGOQDm8IATHu
+EPlYJ06KTw0nKjVgbmpedIs3r+CdT0JfZ4FmszkZWKcxDHtQH7I4rdsh628krmJn
+Q2IbLlNOx4HhbMgWLIzArPSwktc12I6x98Hx7P+rFuuKEZtdX0k7FZXBQwuGbcLn
+6LUnNk7t+1hGWkhlVtiEuaVQCHP/CHO38OHsf96J3xF2J/qQxpf59DKU5h0Fkrzg
+P86mExCoIuyznb5vf/03ga9ht8Ve
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ UEpDZ+oqJxcdV7QpvC9PesO5oSvH
       <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-p00.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.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-p00.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p00.ladok.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-p00.ladok.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-p00.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p01.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p01.ladok.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-p01.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p01.ladok.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-p01.ladok.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-p01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml
index 0808a167..42e547e5 100644
--- a/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p02.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ Al5BqP8qWS5p/VYAytgFhDBZuYxOviJGP5bLFh1unkvw2AK6nO+rLrdURyYtZ8Zm
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p02.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-p02.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml
index 4ffacb0e..676d9206 100644
--- a/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p02.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ LqzpOEkBR8tT0fyC2DJkREVCsGAxvcKabhTQJoROqVBlbP2uMdp8c/e8YDNv4KBD
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p02.ladok.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-p02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml
index 3c15074d..176effeb 100644
--- a/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p03.ladok.umu.se-gui-sp.xml
@@ -67,4 +67,19 @@ X1EbeNi162M=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p03.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-p03.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p06.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p03.ladok.umu.se-student-sp.xml
index 2e546f4d..9ffa9852 100644
--- a/swamid-2.0/ladok3-p06.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-p03.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p06.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p03.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-p06.ladok.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-p06.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p06</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p06</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-p03.ladok.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-p03.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p06.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p06.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-p03.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p03.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p06.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAOix5zlBNSLEMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDYubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDYwNloXDTI0
-MTAwNDE0NDYwNlowIjEgMB4GA1UEAxMXbGFkb2szLXAwNi5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8mIU82TtnYGRnBftG1eL8
-qquRI06Vuorrh6DF8RFIABn0T7Mo2nE1vADdHdeA1rX2sJvQIooZB+79RBRyc6e0
-yTg6kZGMvGKeo4VNWAe4lByWKWT5vgRj8CbRn8A+RMUFAf+P/ubvnpcGrbSlSosU
-G9hHzTzxTTgSIhP8SZzPEesfm9K+gXybdXdgAp+EjVoHs0rFL1U4lOYs512pt1G6
-uAejXrpqlivScL1my3eSWCcWcrknWNBm4FgxDiHojw9+vkYDQsV3HQfr7wO84HXS
-M8eQXLax6xV2eWQD9T5XJro5Azta9gFs5UnVc5LgV3CEwUnOrgBo3pz7pWGJKxBj
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDYubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMDYubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFGpPLPhti69xSWX81LlGIpT/kj4mMA0GCSqGSIb3DQEBBQUA
-A4IBAQCXW6+mPm32KR3kXuL7HgWqsRqQWe/U5wu+nlShNm9QN7eoMEkAfA78nqdN
-Zo0PzIXhtqD3aKnNfIacbTtygZuR3cJtX0CpHjPolHJOvx9WFiPJ8fe6PoX+xkN+
-j4KCk5eTiDm41nMyxHTMpxynFabRZ148ZrkZiADG6rXjSbpmKUFz5JGdhi29vSq1
-DTe5S39afa06bfVzOWLYd+UsjQka4OF951SDAF4Nx4fatoDkpO7Krz6XaGxlzS2W
-RvrQLObmzN2mBM1biJJS0AGapEiXzb+ZqqKf9zizvfKIJ9nhKqNv9SOGSFNX24QW
-PUO1EQo+arx4qeJ4W+ttDEFl+4Bd
+          <ds:X509SubjectName>CN=ladok3-p03.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAITa7jPA160jMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMDMubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDUzNloXDTI0
+MTAwNDE0NDUzNlowIjEgMB4GA1UEAxMXbGFkb2szLXAwMy5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDryI6uwIOp9gUDSGPsCS+E
+vVcRBqDlMeWCRonkKYxByFffgMc/Uazb5GZMi68C3uC4/4bGKjLWqV2/tAv6TOTo
+UnjI5DTnRuVGW7HLV6KBo1g/KdqX1OPQNJ4fVZ5PvOgO1Na2l1+9McyaaaFg9YKI
+wnOn7Ph982kLNEdt4WSNIKSOxtLTW5ZYS1AB00GvxmzES73sUuNq6H+yWpR4Zy8c
+LgzO9TaIWr1oTJBQ0Gc53kBCp5tHUKzZQxQSWNX3dtR3D30UgsNMoemxyjONDBek
+tPyiQ/cxg4Eqgbn9lHw8e/gG4MM5XZZPgp7ZX4Jyl6bPsKEtJqiy+k//oeamWU6b
+AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDMubGFkb2sudW11LnNlhjNo
+dHRwczovL2xhZG9rMy1wMDMubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
+c3AwHQYDVR0OBBYEFAYsoUV6vSB9aoQx9IkeeaJwkTmLMA0GCSqGSIb3DQEBBQUA
+A4IBAQDqDGKx90sJ0cTHdyQ8exoHTjIhrXZeR5NvBa0cCXB/VZIh8OLa1rmC9NsK
+OhOwi/ixm++l1/j8v74my11ZXEedE+DazlPOUAAqdQeKPvpwDG5Z8MIEXlv4s6tB
+3otFRmtL7xoanMe+OfxM834ynM9+Nh+7iz0GVp1r5hlaffJRNd0+SImcXikDlQbC
+vZX2dwP16EorzJc7HyIBNcsJd7voZIOolYzMR4jzLMa2YjxMduguZe2NHQxCaiCy
+A9xJRBQ1Cid74sdTydvN7oXGrxxEQvQuI7fEnCar0aa6QEEjaUEdp7I06YI8gi5W
+10JmI0XOyNL/NLoBCUeFx6zVOgiL
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ PUO1EQo+arx4qeJ4W+ttDEFl+4Bd
       <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-p06.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p06.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p06.ladok.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-p06.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p06.ladok.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-p06.ladok.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-p06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p03.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p03.ladok.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-p03.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p03.ladok.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-p03.ladok.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-p03.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml
index 122a7a64..acc177d7 100644
--- a/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p04.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ DX2pwiVvTPk=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p04.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-p04.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p04.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p04.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index a42c64c2..00000000
--- a/swamid-2.0/ladok3-p04.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p04.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-p04.ladok.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-p04.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p04</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p04</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p04.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p04.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p04.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAMpb1u8wOCflMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDQubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDU0NloXDTI0
-MTAwNDE0NDU0NlowIjEgMB4GA1UEAxMXbGFkb2szLXAwNC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRRsQ6Ran6umULbdel3U3s
-2bSvFaJoJ02PCy97TVXJf4ZFGHEIOz0zz16VBnDZ4KYpJ6UAXhi71gT05lSarMEe
-ssptpzEIWu5iJqY6dHVOyVydyzVZNCSJRjPX3SUsTSSQ2GMePK2QvHXlj9BDood4
-U8bt6Bp0D5yzCXg4d3MWj2J4asrKIhtcFY/tLRXwNJRcCfH7p7yX/V+jl7Q3s4yh
-rfiS3F92ftIw8TtvCJrR3r5kgkzGHBVoqQssnvEe8fZc9YrDp+2DhlmJasinopm8
-SN8pIasKMoT2L5DtLbOT63gYOHYDj4JJvFsENcBrTGE9YEgdnbgRHi1flvSSZgud
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDQubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMDQubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFFTIfNmLHlmAW1LdcLDKcQuP4MuDMA0GCSqGSIb3DQEBBQUA
-A4IBAQAWNMu7cdHqcV3Bqww8Hq/1rJq+c7DJEs1WArpq494aji9EsGAp6sj3V3Yg
-MBIqt3ZPsFXJvxIEJ1Bz+uvlmct3izMB9B2wk+hn8FOB9rL62be2eN+0IZ0UODRl
-1xLwwG1jnbI1/JKt/WgyNSxzZZIoeHke6UN+bDF47y6Ci5uC5oxUpyVBPFgO7LWH
-wVB95fM+M156ebpT5oUjiMvr5sprTRouGpNNMdvBhhsMbJ0omBpvD7HdQkAjX8p4
-xtga4e2lfE1bIxn0FHcarq8TGMHyqy0+HiITVNKh/NDO9uG50DHxiu53D6N/9Pgo
-AP3USOeyGONOlpoZbgadSKbbuAKV
-</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-p04.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p04.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p04.ladok.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-p04.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p04.ladok.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-p04.ladok.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-p04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml
index 80eb62dc..dbe9e696 100644
--- a/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p04.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ AP3USOeyGONOlpoZbgadSKbbuAKV
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p04.ladok.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-p04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit-ik.ladok.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p05.ladok.umu.se-gui-sp.xml
index 3da29020..48cfb29e 100644
--- a/swamid-2.0/student.mit-ik.ladok.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-p05.ladok.umu.se-gui-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.mit-ik.ladok.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p05.ladok.umu.se/gui-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,47 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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.mit-ik.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.mit-ik.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 MIT IK Studentgränsnitt</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description>
-      </mdui:UIInfo>
+      <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-p05.ladok.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-p05.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.mit-ik.ladok.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>student.mit-ik.ladok.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-p05.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p05.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=student.mit-ik.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAKoOk/IYnkUHMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlMB4XDTE1MDIxMTE1MDUzNFoXDTI1
-MDIwODE1MDUzNFowIjEgMB4GA1UEAxMXc3R1ZGVudC5taXQtaWsubGFkb2suc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFjdHFypvK6B6Rir74wGCP
-Ihe6Q2cPg4LFX6MllAToyZ8hTCWjgkWfuIQb0Y19feu0+OtVkX1PNGHI++xZ2jRe
-WXjtbVVvYLZJXZ0pHc5BWKTVBO/ceUHaPpxqHvBG5H/45hD+nBlgNugOEYHuONt3
-kk44ykHEmkOFfXFK2evKDvU0hQQoIvcJLqCnF4YoY+uoW6B0kR85V9S26dI/OYf4
-pQ97FBLjTpdp1mrxl3FzvhreYdp87pMX/Mt8glnlPcC75QISofzhdbCwKt4/K6kp
-Qsh3SogfG0utTmTrMRrX70A4FUT8tINWMW7lYzv3EmQG4NzYqblzEFGW081NNc+d
-AgMBAAGjejB4MFcGA1UdEQRQME6CF3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlhjNo
-dHRwczovL3N0dWRlbnQubWl0LWlrLmxhZG9rLnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFAIPsERizWQ0mxP5l/tZoFmLFdJaMA0GCSqGSIb3DQEBBQUA
-A4IBAQCtIQI5dumWKvG+8JMOl7FHUShqrqLUNZQrOIOaR3vUUpt+e83aHZvxHVjW
-Hdk2KxQXPqzhLZSn6HdPwCvVKjAtEOVnQyDIi46XAgcd5jPxphqO596DQuNvTpOw
-t0HqFe6ZMyNyx/sXNoUioUfDOuNJpOeBq8qcYzE8TILDyXzkdcmnQxzJla9jcCn1
-BTZkB4p0AKYSK6Bj/8Ei2Ts1Qsc91jKuL8IBwtCzwBX/ylIwXZ3gsEHPml4aoQ9K
-nPk29bFsyJEWcfYMu3UnTMPSxCIkr+nyaydY1WWJXWhmbBQ5Sf2AfGrHaA3Lau4W
-FC/69gmQ454invqHaiq/uMW2hYdh
+          <ds:X509SubjectName>CN=ladok3-p05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOGyhlFTWGwtMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMDUubGFkb2sudW11LnNlMB4XDTE0MTAyNzEyMjczMFoXDTI0
+MTAyNDEyMjczMFowIjEgMB4GA1UEAxMXbGFkb2szLXAwNS5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZLNifHL1791cDpUZhxV8t
+vQ4ran06Ve31l5s5LrKJ8S7Lu4XhAYnmWNZzCf/xFD/xqiSf8ZiLxgRZ4sPidiMI
+T6SC5nRy+iKtqLIegbat27WdC8CWY83yL06KImm1UUOBohzv0r7SrIQ7SqjebPn/
+jlzgB6z5pYYWlP0Tguk+j/4dVjJIMDUNnF6nSnchq20L2wANxpmUHvc5SLcEzGTO
+L1yr5dNhdX9lRX51DbD/hhdTyq0naxCVUfaZ+lnLTN9squ1mMT10pzhfV4hcrVo3
+MusXOaDmCGseuqqNBOq0rINH6VhoDIRv1XZXBxYFa14ViPvHfVFrPbJGJsWDWVWx
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2xhZG9rMy1wMDUubGFkb2sudW11LnNlhiZo
+dHRwczovL2xhZG9rMy1wMDUubGFkb2sudW11LnNlL2d1aS1zcDAdBgNVHQ4EFgQU
+F2NnDya3wLXsCg8neaMNB0nHRXkwDQYJKoZIhvcNAQEFBQADggEBAAUrz0OS9Rhx
+8k3O4YgOPlL7UOFzEhmeE7UPkY7IX1Q64/+nVgQvav5088kD7UPiKRmXVNJ+EsN3
+Y880KIYog3Jffx1/+KiSUm5BP+Uj+hf8/IlrIt7lHNtU1y0dGe1xi6QPEIEH43zZ
+knWi/2pfZB465axIiqhhhuJ8cQ0zrB9ERnwS3ytLxs1RhPETJLjeaia89ulsW1CZ
+4t5MkICg43mdGeN/UuV0sB1IBqJGSSY5kT+OYzzAADfptQMDkh9nSsK6zpG1EozO
+WWS9BclAWOyka9kUwsdEJgKAX2x5eC4dlqPQ3HjrIr4B8+X3Ozi7+C3lBSKC7t/3
+l0iIu524znU=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -75,19 +64,34 @@ FC/69gmQ454invqHaiq/uMW2hYdh
       <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.mit-ik.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit-ik.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p05.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p05.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-p05.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p07.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p05.ladok.umu.se-student-sp.xml
index 7787a8d2..60bb02ed 100644
--- a/swamid-2.0/ladok3-p07.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-p05.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p07.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p05.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-p07.ladok.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-p07.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p07</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p07</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-p05.ladok.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-p05.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p07.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p07.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-p05.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p05.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p07.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJALOB0lJK9CHGMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDcubGFkb2sudW11LnNlMB4XDTE1MDIxNjExNDk1NFoXDTI1
-MDIxMzExNDk1NFowIjEgMB4GA1UEAxMXbGFkb2szLXAwNy5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDskb5249mTkvd4IggRNYUZ
-CwmrQlwaa7Q5G80s0sgq+S2i0Sl8Z8k5RHlpKZ5WfpDbOgz1QbT/Oni7qsOYNFXR
-nNJVK1uOYtzcBM0/dRBfwZcONAizRRJxmGMqHRImIlBfJgjx2pRMNKMBb0rAWD27
-ojhgkqnhs4L3/oihHJP+AsSOclFljam1fAkFL7ghC0yn/09r+U3rM2SSmyjTthoz
-5xDsRW0PwkzEvP5vzq1g9lVQ+r10P6D0oR/ZM6VTxsN6AMnAD7Sbkbe8/8hBs5Bc
-Sg7Md1E4aLFdCkX4e6Y2mWDaxfNLQ4HNmHDLnsNS4BD9tZ2Z7v0wbngtu4sovjmd
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDcubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMDcubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFOAKT12EOY5FFsGrQjyMI911PhIlMA0GCSqGSIb3DQEBBQUA
-A4IBAQC73yldc8ZmgVe0sQxrv81+rWwow4NysfqBWeTp1MeSFPrU3H5STAClLIGY
-DsTHV4uqGYrtAx3JbLPbDBiiqFWfPQXGB9108LjQwHQ6uqfDIw2Suxyk0NBfq/0R
-HnAhS6IdfecrN9VnH2jbhesBOGmp+oXaT5ZkpI7HDWH1J40fFMJumd3z3ESbK8jb
-4l6aGUwn6VH9HPas677+8eH7dDUix8WyG7W8/z7sU0o4eIWF7eNllhyazLJlUMwe
-A8HZgJOutfQBQY9/e2CfVMbEZEu1iVX0n+LnbmxPI2CRfX07E2b85fGYK2EmuNOM
-sjb5y7JZIIlUvTDHyVuJ8+91ZMNg
+          <ds:X509SubjectName>CN=ladok3-p05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJANkH73dUhrERMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMDUubGFkb2sudW11LnNlMB4XDTE2MDEyMDEzNTExMFoXDTI2
+MDExNzEzNTExMFowIjEgMB4GA1UEAxMXbGFkb2szLXAwNS5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbKJdgQDov4/XrtZAB20FW
+ddb/r3CL1qfGQQC+dsLhcM0DeypnRmIBAIDFTVuZBe/IeIJuKUVg+PrS4xOq7r56
+Hqf2cyMWZRPtBzWFevKJg4j8a4YG58L9Spx63QFLT8Yt322YGD+5FJPSNhHssPcO
+ZuSJd3pY4B9GilEOP1MGMwh0AO8FpI3tHrsyJ7svFWNbDbuQwZ5kYzjdWaRMsEtx
+x2l0tDWXYPNR2tIBZcmHtWKkEv9+Kp4QqsLpI8ntnMk4pmqcjS9aVBXQlyJKQcMp
+0bq26mht0nnDWVzKme62SOYw31YO1qHWx7ZSUmJ1zD3fWgG5pROBQ6dqe5/lesOV
+AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDUubGFkb2sudW11LnNlhjNo
+dHRwczovL2xhZG9rMy1wMDUubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
+c3AwHQYDVR0OBBYEFGlZmGLsvg8HXUoi05+ZZOFKmmuYMA0GCSqGSIb3DQEBBQUA
+A4IBAQALxXzpwoKwTLCWgIV4aTOB1x4VnOcexGJpUlKXy2fhrFKbS2ZCkrZ5vWAo
+6iG15TjuiykR5h/38s5UMlp4tVvjU51tcWPlWg3ulPpj1J9ap4181OHspfvvZRaq
+4Im4hEeEZG0aqJBqw+UKa8nGt/W2+tVFSMxiOqkl/FkSwNvlDQHPQ37Xb0SjdBew
+DDext96tFqo9mF+BF/G8WceLIDwENfkVkJhs6K7xc5GuVNWO12AJnjdo5Fg0XDlK
+WUa2ZGEuSHVI+0BBeenW81T3KW7TAoOeDEwjAZf8foMfUxD8qbdOznZPyJl4Ou3G
++nqdWfLgBrZNRLZFarHQrsFc855B
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ sjb5y7JZIIlUvTDHyVuJ8+91ZMNg
       <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-p07.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p07.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p07.ladok.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-p07.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p07.ladok.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-p07.ladok.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-p07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p05.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p05.ladok.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-p05.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p05.ladok.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-p05.ladok.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-p05.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml
index 9fe352d0..62ce4036 100644
--- a/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p06.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ aQGrAxWq3Ik=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p06.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-p06.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml
index 114b739a..fa93eee4 100644
--- a/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p06.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ PUO1EQo+arx4qeJ4W+ttDEFl+4Bd
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p06.ladok.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-p06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml
index 981cfa01..da0375e5 100644
--- a/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p07.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ RTluWVSsQj+BYQ3yEKlXqYkzX+hnX3QUWjw40D4Eapo4h4ukwQu+z/rGvdxV3uE8
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p07.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-p07.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml
index 57ad2b4b..b1261c06 100644
--- a/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p07.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ sjb5y7JZIIlUvTDHyVuJ8+91ZMNg
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p07.ladok.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-p07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..9efafe61
--- /dev/null
+++ b/swamid-2.0/ladok3-p08.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p08.ladok.umu.se/gui-sp">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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-p08.ladok.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-p08.ladok.umu.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-p08.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p08.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-p08.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAKdamdq/ScGuMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMDgubGFkb2sudW11LnNlMB4XDTE0MTAyNzEyMjcxNFoXDTI0
+MTAyNDEyMjcxNFowIjEgMB4GA1UEAxMXbGFkb2szLXAwOC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5rOPwY64ZAycyUlTAncTH
+D4y8FFsV5q7ZHuMeYbI9zzYJBzNZtj32xAVMgjMknLI3KVrHQjBJhKk97cCiqOnL
+0u/yLFbkUrXlnu9rvvEddLhGLq0ijSPMas9o26V6gioV1N8W3JxtSc/9nPKjvrVF
+ZzomCpCwRb+XYODJaBUk13SrOijPWj4t7OybCFpcqQiZgN5ZmMKYOlPn2rUeXnSM
+pROafJKegLTr7fee9SaOIcvGE/05Oou1Rnzy+EXtsSbgycexY2bu40D9NzzOKx35
+BGPxCeXN5c99um/KciTlnb7cs22qJynds/+vBmnOP/tDFWmSgN1DpsbhlyKYbs8B
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2xhZG9rMy1wMDgubGFkb2sudW11LnNlhiZo
+dHRwczovL2xhZG9rMy1wMDgubGFkb2sudW11LnNlL2d1aS1zcDAdBgNVHQ4EFgQU
+mSbeyxQ2p8FpI5dbRn/YDdRa1vQwDQYJKoZIhvcNAQEFBQADggEBAAmGVH2A3YP1
+bbojhv8Lhks+U2Eo3E5s+kDO16YLIdb2vPNspAUQwKzH3D5pYCtQs+35ZRli0xOo
+PBtruXEOCQW5599uU/XzaavLbXfAEMtK48tXOSpWZT+WtzQIiy874HVDyU5/hexm
+yCUB7G1LxE6MzUfG8OLPkc1IpzSigSfiDezaC8SgThF5nAynKCtep0ajE8gB5zqm
+ZgV7ddrAB6CLY7TLMtUAvW80b70/wk/88vGmNl4PXf+Mf23Ges+uwHDh/F+v6qgW
+fqWfJvDp8n0tC/7e5JLo35GARrl61CZmX/XvdXGnWnNfGmHvbRXEg5rGdMQaiDTf
+3M3lrNLu+EQ=
+</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-p08.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p08.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p08.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-p08.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml
index 9d214ebd..630a62ab 100644
--- a/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p09.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ TCeJ826gy9aw8ndYfx861MJnmcNXv6S2RdEOOOXhEoilevMh/g6LenvBZQ6gcHRS
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p09.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-p09.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p09.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p09.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index 0fb0c4d5..00000000
--- a/swamid-2.0/ladok3-p09.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p09.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-p09.ladok.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-p09.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p09</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p09</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p09.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p09.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p09.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAJDMEf13vqm0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDkubGFkb2sudW11LnNlMB4XDTE1MDIwOTEwNDExOVoXDTI1
-MDIwNjEwNDExOVowIjEgMB4GA1UEAxMXbGFkb2szLXAwOS5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgU1uWIVhW231AIUHyZneh
-DWU+Ugltcvv53ihgCwRaXRI9QvLhExPGDLYniweFv6PGRX8fom3u/OGT7cTy+QnF
-8mZ5VgJb6Mtkv0ZgIuuFsasCQX7Hg/4UnECz6ZPdLZnjNV/AC38v9ZQnLvrx7SJU
-eBcqCQRmudcz3Qlo+9+I1vUB3LH3IBdLGcRVEtOOnS7J0pb0mWPT6FIpVEa+g7cm
-I3QDrFZjAYeix6scDVIqYgnPwwSJral64tUqIRtuRsTZC3FsCzB8h6J9rszi1dPW
-EGy/I9RTG14rGCuLtXaZQALBm1Mo/7dVD6J7E+E+ChxMHPnykHAl4lY4gjc5FdLx
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDkubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMDkubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFLwAiGxbc8cqytq7LRCVyVBmfs/uMA0GCSqGSIb3DQEBBQUA
-A4IBAQBj4wqdwkNWasllr/4ov3YfHCzDEzk5oRRD0mvK+n4EPqjOe0U0DSEsALFh
-Bq3jL6ETaGDCBVFWnzVInGGo8Q+iEWtDi0IbBG3nKFXH3CzYPGzGRb1jxjOKs9wm
-daqZwPSI+4E6hgz7SGMZUpEXcaIkqUw+Ha2JHIvT3qzmPVNeNHzqv2klAwPQSMKA
-iGOXogu4t0iBxIrWwIJSawO3FaWlNa9s8WvVHpdml+4hFF61dkQ4Z1rYwUcv1MGj
-ncrI0Cpb8E0yZl4rItbZkZat1Xr7ZabhVno2hgVeuSpEgB42dxmfrg2ohLByjMbs
-KrLP2rhVcVzanxwt02kjYwaqb4YH
-</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-p09.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p09.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p09.ladok.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-p09.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p09.ladok.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-p09.ladok.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-p09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml
index 9f5d1fb6..1236d23e 100644
--- a/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p09.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ KrLP2rhVcVzanxwt02kjYwaqb4YH
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p09.ladok.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-p09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml
index 56076d00..82b31b20 100644
--- a/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p10.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ ijxYszxjc/c=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p10.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-p10.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p02.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p10.ladok.umu.se-student-sp.xml
index ab318748..70e7ec66 100644
--- a/swamid-2.0/ladok3-p02.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3-p10.ladok.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p02.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p10.ladok.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3-p02.ladok.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-p02.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p02</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p02</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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-p10.ladok.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-p10.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p02.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p02.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3-p10.ladok.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p10.ladok.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p02.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAO7YOxqnGw0zMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMDIubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDUyNloXDTI0
-MTAwNDE0NDUyNlowIjEgMB4GA1UEAxMXbGFkb2szLXAwMi5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD7/KXVbAFZV4rV8DA7UUY
-S/YzfZCXuLe0F5LN7mBLyMEyJP5KDp4WuKg0DR7Ubsd7I1Xahu00EBQhA3MqkBAn
-hf/5YMTvwojXPqDv76SLw7HoZkpoIOnGrRrXyEcI2gIHGJt5QYRQT61Tj3InM1x6
-3KJ3Kvm0UcQ6eP8s/WAymbGM/KxlcgjWRS3ny3vOxRuSRcFbApTT9CAt8LQg/a7n
-xfqX2KuWvfP9JIQaeSBrH1iY/AlAWpdagUDtFy+zSk12c/yTONy6kjHc5qU15jkG
-X8qxBv6KJLPeOm8d6VCVmUKwW2BHXSCtk/nkfuAZnYbGW6pTxHkQk7p69+Bkm1OZ
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMDIubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMDIubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFGZ/SgWFBjqHY8CDYdT7LPMXBOUgMA0GCSqGSIb3DQEBBQUA
-A4IBAQC9aA+2UYCYjOybPv727ut2+ah1IUa5OV1qZW81vlK2jOGGjbFBuM2cnScC
-TADgN4Rtz7MK1mt5C1zMOx+fJgHcCm/dQVQ8gQ/URaH536RVMlqNZgk4+pPeEZ2y
-UPlcgksxe1tPtHzQC+JOYO8LJ1J0pUIOlWSUL9PaqE/zOstPoh9iwTF3uQCDTUQt
-TEuo8/YIxhhRI5jr6ubQpbkXqaICjDixXqnSZg4ys/LyDjBRSMgQxIoJeO+5yUZd
-LqzpOEkBR8tT0fyC2DJkREVCsGAxvcKabhTQJoROqVBlbP2uMdp8c/e8YDNv4KBD
-6Cc10vDZyVKjqdoAYsy0bSoGAfum
+          <ds:X509SubjectName>CN=ladok3-p10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAMqhtt7ze3OEMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMTAubGFkb2sudW11LnNlMB4XDTE1MDIwOTEwNDEzN1oXDTI1
+MDIwNjEwNDEzN1owIjEgMB4GA1UEAxMXbGFkb2szLXAxMC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCOgWNnhKU3QzNC83c7NYt
+jVDVuElvMBxN8Q0kqOEJNteIGBljezBUNHGGShwaItXsrJx7TByBqVBgWGWcefe7
+9zPp7zPVxrY5fVigstFHo8x/YDCkdTYQpiFLM5BYWlvILAmcIW9JklB2emXRuSMN
+IqqmHP1Jb1B0sq45PN/ZkYXIDfJi4H3QsF/jk7LYCEKG2r5LdPSlXi6yflwawGOf
+48lBi1SrWmt7HKHvxdGw9kk5ZZgRqfTCWythZ18nHVA55+GaGMTIJmd8244a5rOz
+sr77jLlU6XW3FHNcVEQdSTiuPx/WwbQ98GoTgwMBo0vm/V71oVuCIZSWStatzYsJ
+AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMTAubGFkb2sudW11LnNlhjNo
+dHRwczovL2xhZG9rMy1wMTAubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
+c3AwHQYDVR0OBBYEFBpnEwqjZIvezD6LLYeLConLaX1UMA0GCSqGSIb3DQEBBQUA
+A4IBAQBfanBwIBm0id0XyknjzPfcVWTC1nSteYHiJyk1sHOkGEwrj35oxexhyWC5
+TqaP6TCbe16813dYEntpeZ4Vzm7SsYz273l+La0tBUaPi6dHFm948b8Mc1Prbl+o
+JcM/HFXQsIKVTfaNK6CMWbOGJJ2TwVNH3wztX5QheU0ilB7IpVB8bmap3KXBJkGc
+7uuvmu8N87e86GUIvrY6b5qDx54+RO4HrFFCYPRuBr/AEA5yTBhYwLLG3iwglJDj
+Kf/rBdzpvb8Tup6mlbQ86R159ZFLoJfwID6GLBr48B/w0PKBQeGoCAz1e55OF9pD
+/DwGImavMIrNzdLzOpQD2s9IeGm/
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ LqzpOEkBR8tT0fyC2DJkREVCsGAxvcKabhTQJoROqVBlbP2uMdp8c/e8YDNv4KBD
       <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-p02.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p02.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p02.ladok.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-p02.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p02.ladok.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-p02.ladok.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-p02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p10.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p10.ladok.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-p10.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p10.ladok.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-p10.ladok.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-p10.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml
index 7f49d292..4f2aed04 100644
--- a/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p11.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ HqwJ5D+Iif4elek44cMW3Jy6RM0LFYFkO79NvUoMFBCFySaM0MJEyYbtXSMw904x
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p11.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-p11.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p11.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p11.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index ea351c8a..00000000
--- a/swamid-2.0/ladok3-p11.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p11.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-p11.ladok.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-p11.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p11</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p11</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p11.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p11.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p11.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAKehdsNKqM2kMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMTEubGFkb2sudW11LnNlMB4XDTE1MDIwOTEyMTQ1MVoXDTI1
-MDIwNjEyMTQ1MVowIjEgMB4GA1UEAxMXbGFkb2szLXAxMS5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDU3zMW+LnR8zbNpL3zGxNZ
-wCHD75uUACoSzrzCkY5AOyJ3wq67G5tr+RxZTZ6vMf/y8mUVrKoy4eJZPZb45y4Z
-coZsMQDgxy2TisLFD30FnpuiCWsT7mwjBevURhW3GxXaYUQAYYyXmV8dXpmug0oT
-7hLAw77yw46yo84pHprAbBRmxzlh4RVNeU/orX/u2GcMuvtREmUbLcT37FWPqixV
-tuwbGW18esarCIFcjBUluYOsxYeN3qiRGz2A+qzWxspDDvSfoz2m/3Qa6v34ag03
-0+8/B6HVHyZILr2Gx0HBlR4vppCgrghDBsilF0A5dVj35EqSHtvXVtObYqBih87n
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMTEubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMTEubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFIIKvFpin/kTtRfw1fVqTaMQUZRhMA0GCSqGSIb3DQEBBQUA
-A4IBAQDKRzoJiU2h68B0rt6AezOKAduvuv5kcpTfQErTt101x1nQBtLKP/C9E516
-npOwoKVL4RCRkZnUzfiZyJhZqQ96pTQRlsVjN6RC+U0HWa1aOMHM84uI5fRaIWy6
-TOzzsV2mdUtHKEPuYdiqNo/+WqqLnNVbayfZ9bzHk7rSsSNumxvGtrnFPjA0VwI7
-3q1tLLTijrKE3shtVWmjeXVTg1/SqcOkTHsm09bE+jXLM0xAnj3SZ3BnyrgXA/4S
-EGXmplT32/6gc+5yZDyYoaqbAHJDwuSown5ID5/S8ZMwoVSykqFM3LowH3d+sCRu
-gtXEZlr2dLe/argHthcqudmMquP8
-</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-p11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p11.ladok.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-p11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p11.ladok.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-p11.ladok.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-p11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml
index 11e94d9f..71e6835b 100644
--- a/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p11.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ gtXEZlr2dLe/argHthcqudmMquP8
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p11.ladok.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-p11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml
index c8cec425..6f2fd3c8 100644
--- a/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-p12.ladok.umu.se-gui-sp.xml
@@ -92,4 +92,19 @@ mG1iR8k9mTI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p12.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-p12.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p12.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3-p12.ladok.umu.se-student-frontend-sp.xml
deleted file mode 100644
index f5b72d9b..00000000
--- a/swamid-2.0/ladok3-p12.ladok.umu.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-p12.ladok.umu.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://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://ladok3-p12.ladok.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-p12.ladok.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;p12</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;p12</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-p12.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-p12.ladok.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-p12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAJwfFHHm4QTAMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rMy1wMTIubGFkb2sudW11LnNlMB4XDTE1MDIwOTEwNDE0NloXDTI1
-MDIwNjEwNDE0NlowIjEgMB4GA1UEAxMXbGFkb2szLXAxMi5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1hH5bfM0hd5d2hD4Na6LP
-GBeBX337nRyUU0tJaLVQj2fZMygo2zV6fE9ht4dIEzUaS0u8C8HhY2ASHMVYYsb4
-E5L1Jx9fosv8L6tqoX+hL8QZQ2w2SCYGHjRaAEkmhdjMSTp9O3n3q5lFG8jA+unf
-SA9CDvL/R//Imq2oqNrf3cgbfifhD5XnOZRc0gj2THlq0E/fpqXK6XYOIc1ZO9dx
-r2tNw1Zu3zY+c1BbQ42gMa43O1L9S9szfQfJZC6cMa3C5DXHCidJ/sFJ5ITLmxur
-R6pteZI9vyHaIPC+zX4Ta5kn50rhqeITajNExyWo1fA5ebVlRlQ5Jl9L5l6scnMR
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rMy1wMTIubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rMy1wMTIubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFIl6Hqs8E9quQ9zh8x5nn5SzlqF8MA0GCSqGSIb3DQEBBQUA
-A4IBAQCFZ9SxV0u3FYj8PTzaDa6unPRH/0qzZ4LuD87Hmx87n4NL3XFu2e5ocgvf
-lHY3XEr23zWm0u7vZu2M9lD3No/y4wmFPxpv4uSt27EcLPbD8u1LA0q+xzO6/T5j
-NKnxy7NcK+a17PXnsp/XXzOfRtFqkPByitZIbD9KWkuDg6ri2gws1BPc/fHV9V1i
-DWuaLVpBYp5vMqIr5esITLLVNIwk0A68PZy05J87SEr7Gepyg1zyX4AYa52rqkY0
-XQHW0Eym6LKaJ2wLzF/Il9WlgBNOFr7nN2344wyG3cq8Qd1d/zWyms+sauuZxZz7
-uqxBQkCvnX33vrqLW5c3nz5GznAD
-</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-p12.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p12.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p12.ladok.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-p12.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p12.ladok.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-p12.ladok.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-p12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml
index e1eb912e..025be9c6 100644
--- a/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-p12.ladok.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ uqxBQkCvnX33vrqLW5c3nz5GznAD
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p12.ladok.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-p12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-12.ladok.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 64ae916a..66a2d30f 100644
--- a/swamid-2.0/ladok3-12.ladok.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3-12.ladok.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3.its.umu.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -25,46 +25,47 @@ and do *NOT* provide it in real time to your partners.
       <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-12.ladok.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-12.ladok.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.its.umu.se/Shibboleth.sso/DS/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.its.umu.se/Shibboleth.sso/DS/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3#x2011;12</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3#x2011;12</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">Inloggning ladok3.its.umu.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ladok3.its.umu.se login</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Inloggning ladok3.its.umu.se</mdui:Description>
+        <mdui:Description xml:lang="en">ladok3.its.umu.se login</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3-12.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3-12.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>ladok3</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3-12.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPTCCAiWgAwIBAgIJAJMhCC29P8hlMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmxhZG9rMy0xMi5sYWRvay51bXUuc2UwHhcNMTQxMDA3MTQ0MzM4WhcNMjQx
-MDA0MTQ0MzM4WjAhMR8wHQYDVQQDExZsYWRvazMtMTIubGFkb2sudW11LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt27FF0C4jnnFkS9WAH9evibT
-2mQurh1Z19WYXGFQbHRx23hU5IX1CrR/EltoIz3cAzhpKYD24mkSXlYwoYgMlChP
-6Ic+HyWJsxUxcn/jCviD5QZtn73XFyZB5Yihbp//sQtQFxlQcJG1bPgjRUUHXrCs
-qMtdo72BtaYUE47O48RNX5nHWMCDUFCJRinWjO7Y1+AJcMCKHoITWjxCuE8wM90y
-s3qnAAnGqcraMxCE/iVghscvdTzIY2CFNpZWhn9xs0CtyLfElpj98qYCraLfhMOe
-+Pr78tpOJv5c4868f7rhkXfPNC8xE15tjnRRVMmvs1bNvaWsTriOQ24ZEBeMvwID
-AQABo3gwdjBVBgNVHREETjBMghZsYWRvazMtMTIubGFkb2sudW11LnNlhjJodHRw
-czovL2xhZG9rMy0xMi5sYWRvay51bXUuc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAd
-BgNVHQ4EFgQUn1H3qvGaobqFNYNZH33prnm7XUswDQYJKoZIhvcNAQEFBQADggEB
-AH3f6k6w7pNY14cNRRHZMKyXfkBrKevNE8buSBAs5b1yzyVNDThETmT/fEkGCBf+
-zQaEtFdOc7TKMFWwRJaaBu5jSyoitWYFEXZqvNz9spT2mUCKg3PXR+rLk3J1+An3
-+yUk65nAqCtz2YUXYDYZfJyGRUiZGHj7Yixtkj9aH/68byz2fzIPwdFyn8BXDG05
-7LfglwhbBGytnPodGldvHR7dE77Hdt3pJnR8utrVinydoJbogzYCpN+AK6Nkd9r9
-sxle+ramSfhrt8V456dPBSRd16T/db9U3lv+dceE51AC5YA4D31yqKzNRmHJaNSQ
-n1fPE1wPBVcs1yMWkY5e3NM=
+          <ds:X509SubjectName>CN=ladok3</ds:X509SubjectName>
+          <ds:X509Certificate>MIID2TCCAkGgAwIBAgIJANz2DL1oHNjXMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV
+BAMTBmxhZG9rMzAeFw0xNzAyMjgwNzIxMDVaFw0yNzAyMjYwNzIxMDVaMBExDzAN
+BgNVBAMTBmxhZG9rMzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMKq
+QZjLkVQM7Dx95ygn+JY/X/5mCcqyifLZmxtkcl1DCn7K0HkiXp1a++L143SVMx1n
+F4cTURp9rc7zzvmwZSBeYGxlsDkBaxHhhSmIgZYnBniIoSs3hs+wmwtDa2BdgGP1
+plscnkxBbgzhr6f2PX3km0iVPBue/+oMJj2PhSaFLWFB4rJdmiCQS+3FwnumYZHA
+osPfPX3GuzrFbdmnKO7mCkco1lrd3qOqcfbnUA6VKngZIYrDSI+nLzW84JMBbhpU
+EuffJ0o7QWK4/bBnx9tdJIKTP/U3velinTW5IhNbVqaRv53lKlzAOnqx3xDStQGF
+OnGlHmeAf6TLW+BQg9skoSEpCDqEYlGrVLourWZY0iv9LLie8DU2KEGAON21IuaK
+gimO9hGYrJ2ioJTMvCpuSzSNBIlIT8kcNjrKQ9ttuWKKB3gzdJfZllutSxRFMW5v
+3WFKvtLehVdUlnUGtZCQxQrEsWvY413/51py+7C5FSu++ZAgXAJianIFvcRfOQID
+AQABozQwMjARBgNVHREECjAIggZsYWRvazMwHQYDVR0OBBYEFMVocoqaf4pLvk5S
+8b5k1cDTN6++MA0GCSqGSIb3DQEBCwUAA4IBgQDCQRtDEy2cQpds+EVfiXoPXPal
+IWZDu5RqpOOEThAa9MGT0EK8RA9dz7Gv/oPdbjktp5Wp7ZD/NxflWA/MFgshoox8
+REHegXw6ZP/4bS82ZYCLUI7yIU7pZtNDjdEsWZNBZhtroHe/2E6RNnfY188cs9Zu
+ILPt+5BSjQMWvSG9a3Q0oVi9OE7Fb8hTM7AgP91JrfbXmmxPHMLHy2pY+BfLk21S
+nMJuM1zEIE+xZoY3QythJo9y5dWQAgmzb7oBbqhSjPpgUmdxmtgWXJJ3KiGmm7ld
+rUZSbBhJ856mO7fRIu8p+zRfoLgPv9b/nkfVjI7T+zsyQvvUWuGbqA/HQO7hyNmY
+KkHQwOxWM3hUbxKA+69+HB20+LnJED+oOYvbPbC/F3tVr2GE0czzAVXwggbAXBo+
+Mwqj5lLnjZKrUhroci0aLvLCmEwTNfw6J2pEgDmOp+yHl3MG2sikes+PNAGxhmvH
+vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +79,34 @@ n1fPE1wPBVcs1yMWkY5e3NM=
       <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-12.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-12.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-12.ladok.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-12.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-12.ladok.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-12.ladok.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-12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3.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.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.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-user-idp.xml b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
index dec62a01..0adb6969 100644
--- a/swamid-2.0/ladok3.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
@@ -40,4 +40,19 @@ MIIBgTCCASugAwIBAgIJAILqNDVSOCaoMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWxhZG9rMy5p
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
+  <ContactPerson contactType="administrative">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
index 747ff281..e7ec5a00 100644
--- a/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
@@ -93,4 +93,19 @@ L8JKymQ3TDk/0a+t4y/ARC9bJ0ttOPY4K7WD21ddd0/xlz/AvA2g/f1Amlf0DC3T
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.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.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
index 343d47f8..d05cd9ec 100644
--- a/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml
@@ -87,4 +87,19 @@ aYnmCVGoNUbA+6Va0n9luhsqnA1TyI9HPOIbtbvAQ8kvU4ALw31YPGAxvzO1majX
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3edit.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-student-frontend-sp.xml b/swamid-2.0/ladok3edit.its.umu.se-student-sp.xml
index 7f0c019e..16137333 100644
--- a/swamid-2.0/ladok3test.its.umu.se-student-frontend-sp.xml
+++ b/swamid-2.0/ladok3edit.its.umu.se-student-sp.xml
@@ -3,7 +3,7 @@
 This is example metadata only. Do *NOT* supply it as is without review,
 and do *NOT* provide it in real time to your partners.
  -->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3test.its.umu.se/student-frontend-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3edit.its.umu.se/student-sp">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -21,50 +21,36 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/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://ladok3test.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://ladok3test.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok3 testsystem studentgränssnitt ladok3test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok3 testsite student web ladok3test</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 height="64" width="64">https://nya.ladok.umu.se/md/logos/ladok3_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
+      <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://ladok3edit.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://ladok3edit.its.umu.se:446/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://ladok3test.ladok.umu.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>ladok3test.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ladok3edit.its.umu.se/student-sp</ds:KeyName>
+        <ds:KeyName>ladok3edit.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ladok3test.ladok.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQTCCAimgAwIBAgIJAL2VRYNey1OSMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2xhZG9rM3Rlc3QubGFkb2sudW11LnNlMB4XDTE0MTAwNzE0NDYxNVoXDTI0
-MTAwNDE0NDYxNVowIjEgMB4GA1UEAxMXbGFkb2szdGVzdC5sYWRvay51bXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKv4AbIv06DjSMcxPAY+is
-wwNr+zgJQCe0M2rPCL9pMErbrKheiuNqV3CMOTKkW+m+GlzqtmN/lI0a1GPikZ7y
-oH1e3HM0/8WV6rJi30mJy2uheypDhH6SF655IiU90TGraAIpwvirglFiS81Qs/Gd
-rsCBRW7MArW/3FjyfJpsZZbDznrht/1ujKaQ+CiPBW7p0jBg3jR97KUrF0xb2MKp
-Y37VB+l9aA3hmVkmzDLjMGQP6vb8CpNHsRtPi/YHba1zR+ZhB1EW08XTg57Bc+75
-siWzl8SBgb/lctKqb+th7kHM2UpUxaTEzyQiDj4GaWM1saVRwx0Pt3PUK4ZV8rX3
-AgMBAAGjejB4MFcGA1UdEQRQME6CF2xhZG9rM3Rlc3QubGFkb2sudW11LnNlhjNo
-dHRwczovL2xhZG9rM3Rlc3QubGFkb2sudW11LnNlL3N0dWRlbnQtZnJvbnRlbmQt
-c3AwHQYDVR0OBBYEFAhcar1gDeIUEom0QROP0m2iwAmPMA0GCSqGSIb3DQEBBQUA
-A4IBAQArTi0DkttxC98+bOIWbOo4p160nPrmB09li7EVSzaxPIdSu8kJGViRjhhZ
-eoRDEq1imNSqr+hw6opYe/VSEFxTFfsmxcVU2nx2vrZJi/7dIwO+vvvvLvrnqLh6
-phIthf6IueODvpyY8jXXk5FWxPvj4W+aJogaP8n3FNnKMiWXdXxDkuzzwjBA9zQ0
-7pMRDxQXV987rF4bWLvHq4T9oGdk4mR6oPQHVvzdvW+N4EBK496Co9WMz/q4/8qX
-BBkJ8wPZwrE0TNoInfkI0bQ6cFb9M3ZRG++TY2XggAD/GrMGRHOHYjrDtZyewVSq
-P2PZ20jlVrEXyR8xypV/4ioJ1tSQ
+          <ds:X509SubjectName>CN=ladok3edit.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJALvclYFxfRa2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWxhZG9rM2VkaXQuaXRzLnVtdS5zZTAeFw0xNjA0MjkxMTI3MzlaFw0yNjA0
+MjcxMTI3MzlaMCAxHjAcBgNVBAMTFWxhZG9rM2VkaXQuaXRzLnVtdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMAp1NXUsrPWnHLEq8fjyRdrvqLz
+BNLPQt6PPpAQEhkmXnPpCVpfeTDN0KnZYdy3Y2jHkxfz8QBwd/Ck1OCZI9KUjxYX
+rTtTqt4o32Zfk2eZ4aGwXp1ZGx077GkKM1b+XEUs4yk21uHGkhtUCBIKTGB7Miea
+Z1VW31tds+UL6WmjuGQRenFCogROAqdagDvM0ofuv+4jASAZddhRsNWXt9JjFQ+T
+oUIqxpCffekIbdec2hEfxWLLNyDNX928i4zyxI6MAkM0G8vBUcCIxZ/jZVocEERJ
+97MXwx8o31T8F+TM/zqPyrRllADGLltJbL/mk1K0C+E1fDfoVNiHdX7054MCAwEA
+AaNtMGswSgYDVR0RBEMwQYIVbGFkb2szZWRpdC5pdHMudW11LnNlhihodHRwczov
+L2xhZG9rM2VkaXQuaXRzLnVtdS5zZS9zdHVkZW50LXNwMB0GA1UdDgQWBBSqHNS8
+xDGzH5hupajW7Xarth+fiTANBgkqhkiG9w0BAQUFAAOCAQEAXzSr1XAbxBGCQISm
+fimS2pyyhqFBhcWCkBJ89HYI0EBd31vXcMsSZhF28AG5aUcoYO7oglPlfPsC9MvM
+RA7NUsUDtR3Qwi5SUMA2BOc091TgpOXVn1s/ilYpn+O6l7DFIbqLiziEBkS5jecg
+yVzUMKj9Uu2c41ouPaDu4J7fy0YqBF8z7bfnQ8U99vaW82qlRScOQiudqE6Mo3Bb
+No7YM6qy94x7iRWmBoDLZufSV85oSr6ufiOJ438UG34ZHZeeaXO0Ki2EPEFb8hqd
+apw6Yrufmbk/1bKNjv9bNKEwvrp1Jx6IjfkkSHSEid6wlw9AvCewUg3HmBWcZ6py
+aXBwEQ==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,19 +64,34 @@ P2PZ20jlVrEXyR8xypV/4ioJ1tSQ
       <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://ladok3test.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3test.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3test.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://ladok3test.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3test.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://ladok3test.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://ladok3test.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3edit.its.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3edit.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://ladok3edit.its.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3edit.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://ladok3edit.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://ladok3edit.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
index 636255a0..d26c11f4 100644
--- a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
@@ -91,4 +91,19 @@ UEv/iCMoAJgGFRraTZFMDldSSu+MjBUuCi4kZaUImeVa0yXr7qBwZmYvdqgddDKO
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-student-sp.xml b/swamid-2.0/ladok3test.its.umu.se-student-sp.xml
index 76ab5e7d..38ce9473 100644
--- a/swamid-2.0/ladok3test.its.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-student-sp.xml
@@ -93,4 +93,19 @@ P2PZ20jlVrEXyR8xypV/4ioJ1tSQ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3test.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://ladok3test.its.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>ITS, Umea universitet</md:Company>
+    <md:SurName>Fredrik Domeij</md:SurName>
+    <md:EmailAddress>fredrik.domeij@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
index 5dcdd01c..7f252801 100644
--- a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
@@ -40,4 +40,19 @@ MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rl
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
+  <ContactPerson contactType="administrative">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>ITS, Umea universitet</Company>
+    <SurName>Fredrik Domeij</SurName>
+    <EmailAddress>fredrik.domeij@umu.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/student.ate.grayzone.ladok.se-student-frontend-sp.xml b/swamid-2.0/student.ate.grayzone.ladok.se-student-frontend-sp.xml
deleted file mode 100644
index 3481ed7e..00000000
--- a/swamid-2.0/student.ate.grayzone.ladok.se-student-frontend-sp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://student.ate.grayzone.ladok.se/student-frontend-sp">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla: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.ate.grayzone.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.ate.grayzone.ladok.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ladok student.ate.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ladok student.ate.grayzone.ladok.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
-        <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 height="64" width="64">https://student.ate.grayzone.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://student.ate.grayzone.ladok.se/student-frontend-sp</ds:KeyName>
-        <ds:KeyName>student.ate.grayzone.ladok.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=student.ate.grayzone.ladok.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDWzCCAkOgAwIBAgIJAOBK9PZhQOs2MA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV
-BAMTHXN0dWRlbnQuYXRlLmdyYXl6b25lLmxhZG9rLnNlMB4XDTE2MDQyNzEyMjg0
-MVoXDTI2MDQyNTEyMjg0MVowKDEmMCQGA1UEAxMdc3R1ZGVudC5hdGUuZ3JheXpv
-bmUubGFkb2suc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfxgev
-jQV/269Epy5aAcDBvQZwV0wYvI+RejGTw5Ac7Nmk5GkyvnUrmA0S206OTaqIuudX
-ga4IlckmGA/85hkkiky7FplOrcqBS3hWWM386KuOs+HmoDmobe+A7ayh0afQJPWn
-uij/jbeneh/N+1mwudS2g+Qk+S+PXPm737i2VL8or1SiVWJdQOg2qWAvvuGePNZt
-FkvAd/+Ef+oqnWONkL0hG1GBO4l2cVoTwqt4Dm3sUbukEAehcEwzAdv0vYDRDveQ
-13Y6DCRZIh1/5GYIEn55hPshdoGzXdOo4eTNyom8QqxVGgl0pmEGC0gCUjOcmA67
-FXcu1RBZMst2iDJ1AgMBAAGjgYcwgYQwYwYDVR0RBFwwWoIdc3R1ZGVudC5hdGUu
-Z3JheXpvbmUubGFkb2suc2WGOWh0dHBzOi8vc3R1ZGVudC5hdGUuZ3JheXpvbmUu
-bGFkb2suc2Uvc3R1ZGVudC1mcm9udGVuZC1zcDAdBgNVHQ4EFgQUKYqRC3vBn5WL
-bADDc9OP1ttbAuQwDQYJKoZIhvcNAQELBQADggEBAHE8V8tNdPlFRyn2XkKWLp+k
-PXVDWLIRNTQ58Nt4el7umnnHtpzjRvdvtZfA5usd4E851SKPPxYaKz6Dqe2dv6YS
-2wxiJ/soTvIP0itkxXKenl5fxBT0O33iM2x013t2CkFY1OBDJ5ZZw35hwj86q53v
-JX9l6msxElSv70clZU9S+TXEcbgMuUQvc00vdrUjy3C4oi66cSBvkN+pu5zjFBG1
-NcJjSEwosSeScrbtXcS5mMUx+8+IPqk+4rNbYA5BTpdbaEkRt1Hre8p4n9bNRgJf
-/6ALKcljd/KBbxSMvRne29oBEuJEjibi7D3+eQB+QyBne2v0EaKHxcOp6D2iJHI=
-</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.ate.grayzone.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.ate.grayzone.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
author	Fredrik Domeij <fredrik.domeij@umu.se>	2017-02-28 09:03:13 +0100
committer	Fredrik Domeij <fredrik.domeij@umu.se>	2017-02-28 09:03:13 +0100
commit	e2ab4f74c50ae2e555871eea08e792bedcc5f497 (patch)
tree	48074a8fd61c1380e654f8d7a1969c8d81fe4dcf /swamid-2.0
parent	75b8cf92a880f7264670094edaa1508fc8007ffd (diff)