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

11 files changed, 565 insertions, 122 deletions

diff --git a/swamid-2.0/play.kau.se.xml b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
index 1018b5c8..937be42f 100644
--- a/swamid-2.0/play.kau.se.xml
+++ b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.kau.se">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://1827881.mediaspace.kaltura.com/">
   <md:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
@@ -8,15 +8,6 @@
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kau play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kau play</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är Karlstads universitets play tjänst</mdui:Description>
-        <mdui:Description xml:lang="en">This is Karlstad University's streaming service</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://play.kau.se/Om</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -31,17 +22,17 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.kau.se/user/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://1827881.mediaspace.kaltura.com/user/logout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.kau.se/user/authenticate" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://1827881.mediaspace.kaltura.com/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">KauPlay</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KauPlay</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.kau.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">Old KauPlay</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Old KauPlay</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://1827881.mediaspace.kaltura.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml b/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml
deleted file mode 100644
index f57b131d..00000000
--- a/swamid-2.0/337-mediaspace.kaltura.nordu.net.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://337-mediaspace.kaltura.nordu.net">
-  <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology’s Play service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskolas Play tjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blekinge Institute of Technology’s streaming service.</mdui:Description>
-        <mdui:Description xml:lang="sv">Blekinge Tekniska Högskolas play tjänst</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICMjCCAZugAwIBAgIUSNmSXuKOmQgtimtnumPU1gAM/PYwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjI1MDkyMTE2WhcNMTkwNjI1MDkyMTE2WjA9MSkwJwYDVQQDDCAzMzctbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0jIT398Vd2YsyF9LUzYZy5eJlpo3UIdNeGOWUcLDfC6ixe6Z1DLjYHYpsld3zjAhO1+V9UuRaXAwlBf+DbOZFudtNa7gq7+Xh3zUOVb+9wIU/sw1lgi6bJ2xX7k9axM9yAUmquCYTrsP0l+OLSLh0tvKhs9RwPMkCDu90Id3qUCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAeJ1744GzQ+UeeZZljO2yhEqBZIUXvdAQZXVGYcGEH8VVv6uXFGntgKqA8kqG5/KdlRz8wVuaAwlcnj7QEuEoWMv1V1q5laFqJApu5vguZruEoiRNUEmpGTG9LDE1w/4or4K06GqJCJePJnB5mesLHwi8KgFPXmzGu2O2Vs2x1eY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICMjCCAZugAwIBAgIUSNmSXuKOmQgtimtnumPU1gAM/PYwDQYJKoZIhvcNAQEFBQAwPTEpMCcGA1UEAwwgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQxEDAOBgNVBAoMB2thbHR1cmEwHhcNMTgwNjI1MDkyMTE2WhcNMTkwNjI1MDkyMTE2WjA9MSkwJwYDVQQDDCAzMzctbWVkaWFzcGFjZS5rYWx0dXJhLm5vcmR1Lm5ldDEQMA4GA1UECgwHa2FsdHVyYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0jIT398Vd2YsyF9LUzYZy5eJlpo3UIdNeGOWUcLDfC6ixe6Z1DLjYHYpsld3zjAhO1+V9UuRaXAwlBf+DbOZFudtNa7gq7+Xh3zUOVb+9wIU/sw1lgi6bJ2xX7k9axM9yAUmquCYTrsP0l+OLSLh0tvKhs9RwPMkCDu90Id3qUCAwEAAaMvMC0wKwYDVR0RBCQwIoIgMzM3LW1lZGlhc3BhY2Uua2FsdHVyYS5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADgYEAeJ1744GzQ+UeeZZljO2yhEqBZIUXvdAQZXVGYcGEH8VVv6uXFGntgKqA8kqG5/KdlRz8wVuaAwlcnj7QEuEoWMv1V1q5laFqJApu5vguZruEoiRNUEmpGTG9LDE1w/4or4K06GqJCJePJnB5mesLHwi8KgFPXmzGu2O2Vs2x1eY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://337-mediaspace.kaltura.nordu.net/user/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://337-mediaspace.kaltura.nordu.net/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">BTH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://337-mediaspace.kaltura.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUnet</md:GivenName>
-    <md:SurName>SAML Admin</md:SurName>
-    <md:EmailAddress>saml@media.nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/aqtest.port.se-shibboleth.xml b/swamid-2.0/aqtest.port.se-shibboleth.xml
index 6481d884..b909e27d 100644
--- a/swamid-2.0/aqtest.port.se-shibboleth.xml
+++ b/swamid-2.0/aqtest.port.se-shibboleth.xml
@@ -17,6 +17,12 @@
     <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>
diff --git a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 9125aa48..5e97a540 100644
--- a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
@@ -1,9 +1,5 @@
 <?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://jira-test.its.umu.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-stage.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"/>
@@ -30,10 +26,10 @@ and do *NOT* provide it in real time to your partners.
   </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://jira-test.its.umu.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-test.its.umu.se/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://jira-test.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-test.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://jira-stage.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-stage.its.umu.se/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://jira-stage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jira-stage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Jira Test, ITS, Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Jira Test, ITS, Umeå University</mdui:DisplayName>
@@ -43,33 +39,33 @@ and do *NOT* provide it in real time to your partners.
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://jira-test.its.umu.se/shibboleth</ds:KeyName>
-        <ds:KeyName>jira-test.its.umu.se</ds:KeyName>
+        <ds:KeyName>https://jira-stage.its.umu.se/shibboleth</ds:KeyName>
+        <ds:KeyName>jira-stage.its.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-test.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELDCCApSgAwIBAgIJAIwCaY3F/5fPMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFGppcmEtdGVzdC5pdHMudW11LnNlMB4XDTE3MTAwNTEzMzM1MVoXDTI3MTAw
-MzEzMzM1MVowHzEdMBsGA1UEAxMUamlyYS10ZXN0Lml0cy51bXUuc2UwggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC+a5oMUtQvu6HIRyKGyAV/xNFrdoIO
-pV3RUe+jnc2Re20qD4lAjz07xV0LvICOzF2QumUelLWgrXB6pL2fjQM4LVExerbN
-9+yUsEF7SJseBeVfQgQheNyeX0GgsWFlIKQ+YALRZAPBm5rDFKgfsaxh9hcJgt4R
-y4BuPDhTBusXjX8hzN6pfoulSMspEMOTQAKKDxyhyqN6+l2wOkiCapPyQze2hlhL
-suvt2Txu44tTI4mdnMp2uYHWZkxgTVzFbZRWJ41nUM00xJkkUuJGL3XAahTUM9gv
-hK0VbDl3U2uDOZ9pdZGmnxRypGdxoDtXuU3sbwRbRydAg/Ya69YuF8zHw9hUBa/I
-i0t7HaSNNWS7IdB+bLVfn1mw326z+GdkC1B8KSZb59lv5WqKZVZ7bCs0yJYynuo/
-cix+H7MTq22QuYZINDoxD9gPN5HlJycMEEivFDMyhVdTPUwp7u9OQ21PQl3E2sNt
-//oUnUF1/gB0rucCCXY0qSN3WCL7Vwex4isCAwEAAaNrMGkwSAYDVR0RBEEwP4IU
-amlyYS10ZXN0Lml0cy51bXUuc2WGJ2h0dHBzOi8vamlyYS10ZXN0Lml0cy51bXUu
-c2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwIUKTZvWSSDUSlAqUTixFZFvA9swDQYJ
-KoZIhvcNAQELBQADggGBAJX5lUdKqOmj9bkED5jZWovWo5vuayZ2LxcmWu3UwDz1
-ZntDf8lLeujVW+mLhKLyYPX7UQrwfcjJOCvjk7Ps/O8IDqpzHJDRKP4tRv6v+1F2
-LwPjytRKjx3lv73tyKrUtYtZY5ra5I5E/VaJbX/kSz9d4aIpqPukaAba9BD8d7Rc
-ylz8OAOf4erIFuqkBncUtkAdtXgKERC8qYv+IaHHa7pNnqkejbFQbomhOO2K9kaz
-pgNg7h9AvXKq9PTtf7ozKV1DQEi8hRY1XH+3beeENYqAOP6ugXyOnw6RUxF+z0JJ
-M7kgJTYE8q8u82KhntgDtAEg4Z/Wq3f2oIMfLZPJx7/xqNMrBaVzaVZmvhM+lqwj
-Tr8KgUo0LHzZum1Aebo7ScT6cdOD3Xfvvt8F+ZUR57U+fFSsSx00JUwb1tD3o6qu
-/ggX9O5JLDBs2VXs5sK/O+8el+4JgTnmuCA41arfQlhBP5/MU7Qo48tJ2OYi1Bp8
-GsQCL1moH4F0OZi+taTeTQ==
+          <ds:X509SubjectName>CN=jira-stage.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEMDCCApigAwIBAgIJAP6OX7KPSKdHMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
+BAMTFWppcmEtc3RhZ2UuaXRzLnVtdS5zZTAeFw0xODA4MjkxMDI5NDNaFw0yODA4
+MjYxMDI5NDNaMCAxHjAcBgNVBAMTFWppcmEtc3RhZ2UuaXRzLnVtdS5zZTCCAaIw
+DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALOLMdzwUINo+yS/dcasn7jlhfTo
+4EueyXLtHV4C2mhpaW+05db1n6eEdvOh9wO+IO3pd6V3XDKdxpLFuJMZhtGZDPYM
+uPS9fzBBbR7UzbX43WhQt4LnYyKyFYxOukIJi91BHRn5uTNFKy/wY0rBA9MRIN7e
+YELuPkorQbSMLMhDLY7+Mih6papxVb4+Gz0s3EZgMQE8JAbFNWDc7QvHo9GGQpnP
+g1TZ4ny4dw8VSweEfJ6JgMiaOANYzhJpXuVfqL6TmL5Wc9K49HQOJZbs70Sq4umG
+TDekF7w5RhQidZgRFbk2+kTQKO2uDmY/DTdwvkf1FJRgqCfuNCjprYNblMwel/xf
+fatFAOfpuJIFJfsaEMHW3cu/2qm3DzCfc1ecD+XPvIrObecykxqV8knvsjeWcffT
+IJKVeobshaO8oGxjFmXddHHh7tAx34qV+lI+i82YcwhGiFLSy47QNioytlbDWuE5
+6G344DWMlmiVFNdRTIJdL6hkVWALSEl4mEr5TwIDAQABo20wazBKBgNVHREEQzBB
+ghVqaXJhLXN0YWdlLml0cy51bXUuc2WGKGh0dHBzOi8vamlyYS1zdGFnZS5pdHMu
+dW11LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFAWikWgW2ofGrspwDAsva1pYpOqt
+MA0GCSqGSIb3DQEBCwUAA4IBgQCQIMT3ZD3+in5g5sa7oV7zq0Sd/IoxVLjSGWte
+EP7pEaHh7T+B96AbAnQCVA8oxLwLGrYBsCvc7FFddTMy7WCQrPmnDd2hOsYCjTyZ
+SL0uux6gllMf7AjdxwZli+DAg6NQuAdk45HTYyoDCCAgb0EnVpYGzZKB/PTnXXQt
+yfkeGwddfJpuAaY39DX06dJ/5QezyHwUeMtPZCScGdTkpUGx4PjzkIhmiHB/0gXE
+bJLp3udH2ecUFcCFEpDczl0dtl+IeS2Qyvxppo6YW6Rq6NJBImh9qJKzuwdh1Tlm
+1V1Pn8oC0WZ9B4brAXOfWPkPobm1RNceyt1my60U6d7EhLNdEZiEwJR+hjwCHn3H
+JYCm+68K+pB5ziwCPgvjIriUMJKHruO/ITwdr34eNf4iBJ987VVEFaAj53cFkMbK
+hUFTk032OhFsp+vDX5hjQksspyzYpGBoPyjIbIJKbPjbnLBjQe2Iw1340p64iNEG
+LUM1EdYsX8qUyvMYoftcOdiik08=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -83,19 +79,23 @@ GsQCL1moH4F0OZi+taTeTQ==
       <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://jira-test.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-stage.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-stage.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Risto Järvi</md:SurName>
+    <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/koha-test.lub.lu.se-shibboleth.xml b/swamid-2.0/koha-test.lub.lu.se-shibboleth.xml
new file mode 100644
index 00000000..3361efd5
--- /dev/null
+++ b/swamid-2.0/koha-test.lub.lu.se-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://koha-test.lub.lu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://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://koha-test.lub.lu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">LUBcat Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">LUBcat Test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">LUBcat, bibliotekskatalogen vid Lunds universitet Test</mdui:Description>
+        <mdui:Description xml:lang="en">LUBcat, the library catalogue at Lund University Test</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>koha-test.lub.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=koha-test.lub.lu.se</ds:X509SubjectName>
+          <ds:X509Certificate>
+	      MIIEADCCAmigAwIBAgIJAPuwyH78OlGWMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
+	      BAMTE2tvaGEtdGVzdC5sdWIubHUuc2UwHhcNMTgwNzEwMTMxMDQ4WhcNMjgwNzA3
+	      MTMxMDQ4WjAeMRwwGgYDVQQDExNrb2hhLXRlc3QubHViLmx1LnNlMIIBojANBgkq
+	      hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAx5YmazyKcYm2cvOlVyzTZj3hoVIHVU1t
+	      WcIYXN2KXMG4sB9d7r5d5jGEOZAPLLKWZgjg06sOaNllmzHka8ceuzgkACdPhrIS
+	      nw9AHTDCqPvNmY7bCja5kXxmkRArWZd6m/CZ/P/b0UhWTNpwzQRxsm2Q1tQ+52T8
+	      B5jWJncFmEsyETsvCSwJWehuCGRdsuL/YqZGVf7hJYNhz+HdeCZogfWFGGvjMVu+
+	      ZN7WHX5prRORhl3wHt2xoyznOCqLfZjR9EUqYEzv4Zq3aZoc5bZkKb01LFB/1H9Q
+	      EBPfe7vycpptfWimN+N4t+9dfMsI1xEy7vqb6ErpEsqRIOyga3aIkNPFATpy/esF
+	      Fes5TSNNK7vKV70la8+254c35yEqFbkhV3ABhswTBDoFPaM5xWoTv3X2vUZrJ0Fw
+	      r3YHTjsAbmV361aVseLDrA7JLFFKFKSWVWCk/UZ7hVP1DR8WNxTM4nOm9uqXHmD1
+	      J2HHLEsbCJnqqMuYD/zuNb8cHwcO3C2FAgMBAAGjQTA/MB4GA1UdEQQXMBWCE2tv
+	      aGEtdGVzdC5sdWIubHUuc2UwHQYDVR0OBBYEFMCHhB02ZSpU+vFN/oD83cORQcNS
+	      MA0GCSqGSIb3DQEBCwUAA4IBgQAfFgX6FXYk26+RR+8Im9RE1D0LPpZlfOUmRSMe
+	      t8Gu6NSY5R+C1xzhqUUJEHEcH5yNSxXxaXic29T5jQPTKKWhNR2w3NIp+P/+tAvY
+	      mBKOR2LlpwucbPN4GGR6H651Lgv+/8pKf00P8mIeuIfHJsoXq7uAkU/ecMoqCDnd
+	      2A9YwPrtf0I1exf9uN1sLiMxhuu2Ku1cubkq8t7qFniSa7BDURymRP6hdjNknBY6
+	      L9p1afznwW4+uSjt9RPtDOwo0FjWxzNGA/61fggnI9IdjHs+W2NyiGAJjnqp3fkq
+	      a6H7GS4oAxk/NoH7Sx+AMmxS1i1LCjn+8undFMAWMiOSmgHjxe4AFhGwlKZg7kGU
+	      dGrRwLgh9syjW6RaDVtUx7HQPkUV0KCMuSGFtvioSS8ESnwgWS6uChmRRsHaoQd0
+	      6Bsx6inlAePegQ30jMQqhlHfTc6GBRefF2Wxa849ng3FsWcKnPHB7pG6e4nWCEuT
+	      RfgrrCC3+RoEW26wpXZmmh21BQI=
+	  </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://koha-test.lub.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://koha-test.lub.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">lu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Lund University</md:Company>
+    <md:SurName>Dave Sherohman</md:SurName>
+    <md:EmailAddress>mailto:dave.sherohman@ub.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lis.ladok.sunet.se-shibboleth.xml b/swamid-2.0/lis.ladok.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..13ae6466
--- /dev/null
+++ b/swamid-2.0/lis.ladok.sunet.se-shibboleth.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lis.ladok.sunet.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Administrationsverktyg Ladok-Canvas integration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Administrative tool for Ladok-Canvas integration</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Logverktyg för hanterade händelser</mdui:Description>
+        <mdui:Description xml:lang="en">Log viewer for handled events</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://lis.ladok.sunet.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://lis.ladok.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>signing.lis.ladok.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=signing.lis.ladok.sunet.se,OU=ITS,O=Umea University,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE3zCCA8egAwIBAgIJAPhWjc2h+5AIMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMRgw
+FgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEjMCEGA1UEAxMa
+c2lnbmluZy5saXMubGFkb2suc3VuZXQuc2UxIzAhBgkqhkiG9w0BCQEWFHRvbW15
+LmxhcnNzb25AdW11LnNlMB4XDTE4MDgxNzA2MDIxN1oXDTIxMDYzMDA2MDIxN1ow
+gaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcT
+BFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMSMw
+IQYDVQQDExpzaWduaW5nLmxpcy5sYWRvay5zdW5ldC5zZTEjMCEGCSqGSIb3DQEJ
+ARYUdG9tbXkubGFyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDuHA2qy8BWs8DjtiIwYQ8DwnAe5fUOAgyLvU2mH31Qh0Gt6EoWtJKC
+2qG9r2os4GpQJyhDGbGrphjExgakq/Wi0XfksieCSYL8+JKjiIVaAa6+vTM+baxe
+NCVjqQzQBx35yeuFi9M/CDOPqO8pVw0ump+PyHiaO5cBR6tRGYYeiNn2e25upW4P
+PWCuOchpzAyL6eeqcZTHx+1VRDH8T/a7Tw4IlfH3aMn71d2RN5PgGytQN5Cp3NcA
+SG6myNRq7gl74Xv0i6G/jPSMYCcRZ1B4mm0q9uLNHa5b8IwwhjvYNLHMhON0r59I
+DdNaeT+V64D0GiDWMI6gw77H3pBUXbdVAgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
+rx3w3PCs+RMz9XjC7YCraE5/tmcwgdoGA1UdIwSB0jCBz4AUrx3w3PCs+RMz9XjC
+7YCraE5/tmehgaukgagwgaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJi
+b3R0ZW4xDTALBgNVBAcTBFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEM
+MAoGA1UECxMDSVRTMSMwIQYDVQQDExpzaWduaW5nLmxpcy5sYWRvay5zdW5ldC5z
+ZTEjMCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQD4Vo3NofuQ
+CDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA/6Swk1L6IDnMJidEi
+KfRyEmpbaFI3PbAFIfwqx87LAttB/Zc8GYo2RmnlTcbu/Tiu0xh7FEMUwHakjuj8
+OzTOfibIS20Ht4tmvQJ15yoTD010i239A7+LCTTzfH0VZJom3/P6wyauHXKoQnHf
+2mE1L3iyZWVDF01Mx+fng3I1mqwLpOlbvZzq4B+2VciNhYRFIxIiczTcb2AHPWrq
+/Yd4ucMTfeN+vGnC4+lavM5FTSiF+yzNQTjU4jJ0v+D5VnPIF2coDEdkiHebKEeF
+rzFSMNotRzVyn94d1SLTwnc5q9KXsonV02WPtRFHhjrgRsnHed0+TriFY5YZhAey
+Nlzw
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>encrypt.lis.ladok.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=encrypt.lis.ladok.sunet.se,OU=ITS,O=Umea University,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE3zCCA8egAwIBAgIJAKj7bUIT1VLPMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
+VQQGEwJTRTEVMBMGA1UECBMMVmFzdGVyYm90dGVuMQ0wCwYDVQQHEwRVbWVhMRgw
+FgYDVQQKEw9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEjMCEGA1UEAxMa
+ZW5jcnlwdC5saXMubGFkb2suc3VuZXQuc2UxIzAhBgkqhkiG9w0BCQEWFHRvbW15
+LmxhcnNzb25AdW11LnNlMB4XDTE4MDgxNzA2MDExMFoXDTIxMDYzMDA2MDExMFow
+gaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJib3R0ZW4xDTALBgNVBAcT
+BFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMSMw
+IQYDVQQDExplbmNyeXB0Lmxpcy5sYWRvay5zdW5ldC5zZTEjMCEGCSqGSIb3DQEJ
+ARYUdG9tbXkubGFyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC1ohE9UGaS2US7z1aHuQhY9lyye7Csl+Kb9NDi9LYa8ZFXQIijb4W8
+GRKqOlRofXyhaWGoDk0O88X0j/9+NrnS1w/3fS6lUhIZrVn3gOmNC6Uta5ClT1XY
+AQ7rVq7GO5k30/DjlQQ4LEgiSQPRDEiwkf/2TyYSrxwaYHSBEjcgZwTMNTXVb1cq
+TmVvdE6DOerozXosxFXo9G1vUF9pIeXYi6kWDv6H7jkDSpQi+nPDoRQN7dPIaTf8
+rPF1BepkYlQkZDZrGjuTFoGM8lGq6b04Gc2M7+Q4u3MRTjsC4xhAk181ujvfUDbg
+/lFEBgzFy+KtTrBh5PIAoKzfeLSsgpkZAgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
+XXh1Fs25t8gxtnE28rqqBB+GVY0wgdoGA1UdIwSB0jCBz4AUXXh1Fs25t8gxtnE2
+8rqqBB+GVY2hgaukgagwgaUxCzAJBgNVBAYTAlNFMRUwEwYDVQQIEwxWYXN0ZXJi
+b3R0ZW4xDTALBgNVBAcTBFVtZWExGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTEM
+MAoGA1UECxMDSVRTMSMwIQYDVQQDExplbmNyeXB0Lmxpcy5sYWRvay5zdW5ldC5z
+ZTEjMCEGCSqGSIb3DQEJARYUdG9tbXkubGFyc3NvbkB1bXUuc2WCCQCo+21CE9VS
+zzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAGivkj3tBfQO9C2Uvt
+OOtoJkCOGE8vBE9bfKgPxfgBv42w3OSOo8YzYCOf7HiAV4yse7mQfbfGjRqtbGhn
+rWFITCFUMCRzr9G4Vmgf7ckKOxxxdYnawZkQBdMRQ5SwbSpTOHXWJGPGBgIkCh9s
+plJbJk1w0sxrriuGHiRbIeEOJSQXjG0bKJLjEHkZnDIBPMBEbCvfYj3VFwYeQW2S
+DAELXN1yRdl0IHUQOse58XuCksLiW2Ih7GVhEqCDTo/bxTlxV7vCIEmZBkvncHzh
++w2MDjfBGwGosbfO7UcjkA4OVlb3sBdXRXC1DolS3H+CplXR1HiP4kcbcisDw7P7
+i23B
+</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://lis.ladok.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olov</md:GivenName>
+    <md:SurName>Höglund</md:SurName>
+    <md:EmailAddress>mailto:olov.hoglund@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
index 3d2e3579..e2a1ef2a 100644
--- a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
@@ -14,11 +14,11 @@
       <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://mp.uu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare</mdui:Description>
-        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare.</mdui:Description>
+        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/sv/web/support/om-mp</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/en/web/support/om-mp</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -54,7 +54,7 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</md:ServiceName>
-      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</md:ServiceName>
+      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University</md:ServiceName>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
@@ -66,7 +66,7 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
     <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
diff --git a/swamid-2.0/primula.lnu.se-shibboleth.xml b/swamid-2.0/primula.lnu.se-shibboleth.xml
new file mode 100644
index 00000000..3c3a2b4d
--- /dev/null
+++ b/swamid-2.0/primula.lnu.se-shibboleth.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://primula.lnu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">
+                Primula
+            </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">
+                Primula
+            </mdui:DisplayName>
+        <mdui:Description xml:lang="sv">
+                Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid LNU
+            </mdui:Description>
+        <mdui:Description xml:lang="en">
+                The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at LNU
+            </mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
+MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
+EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
+B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
+MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
+MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
+QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
+CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
+ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
+gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
+zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
+hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
+7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
+uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
+GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
+NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
+2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
+fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
+DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primula.lnu.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primula.lnu.se/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primula.lnu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://primula.lnu.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://primula.lnu.se/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..c658a607
--- /dev/null
+++ b/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tentaadmintest.uhr.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <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://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://tentaadmintest.uhr.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TentaAdmin Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TentaAdmin Test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testsystem för administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:Description xml:lang="en">Testsystem för administration av tentamen och tentamensvakter.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhrextwebtest01.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhrextwebtest01.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAN6k6XIcpXI3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHVocmV4dHdlYnRlc3QwMS5pLnVoci5zZTAeFw0xNDA5MTUxMTM1NTFaFw0y
+NDA5MTIxMTM1NTFaMCMxITAfBgNVBAMTGHVocmV4dHdlYnRlc3QwMS5pLnVoci5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMs4QlMhfYX8rSvesdpb
+12C82iJMsUIi4d5omOwxmt7HNA6Xxz3HEW/ge3WmsjpHL1tN1gWQkILLOKyAUAPw
+R1xEEREQiNeFnrdcqpfMmSJudgumoocHLwNiU6Tcooi0aQGDkobvnX2r9oUbd2T5
+A/qXmwk1czLeHD0HAC+gD4Nsmjto0AvuxGHKlceSZStXAhdsdHpCKUEzReHPHkyO
+n4uE3fmDg2jnVeZQNbkRoWTZN216YBGaBYux0FDD9fnJA/X/8qPOPAwDptcNQj5u
+SS4zppajv2BaAHe3/IxXoCb3WEDE2i20N7FJ6pqiqfZbE8C8QwCrE+Ylj2m7UVLx
+vmUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdWhyZXh0d2VidGVzdDAxLmkudWhyLnNl
+MB0GA1UdDgQWBBQGJCUBefBDuYDpYQgWYVA1RaJo+TANBgkqhkiG9w0BAQUFAAOC
+AQEAfqYGfsx2YapLPbtavNH9c5BMK+uvx2Z52nJbje9/RdTigmDtPbW+ZSOibMpD
+EC7BlH7OMRM5j0/vVlRoRadjkJmRaEf/VfaNxwktgNQPVkXQatycSZ7oderQngbG
+CVlWHY4+3c6XmbuQZDjPYFQcbamkQf61/0xyPAXr6z7vF1RiSzt4ej9q3gI+7/if
+nQjC6dzNCzYmZcO1m5jx5BgECpee+1YzPgWSnZmXexQiPsv7AeTosT0CxdFkwKz9
+OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
+9qq7wBTjnxf2rBXhnRNuEzB+Jw==
+</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://tentaadmintest.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML2/POST" index="10"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Anders</md:GivenName>
+    <md:SurName>Möllström</md:SurName>
+    <md:EmailAddress>mailto:Anders.mollstrom@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
new file mode 100644
index 00000000..b81d1538
--- /dev/null
+++ b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-lnu.hr.evry.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">
+                Primula test
+            </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">
+                Primula test
+            </mdui:DisplayName>
+        <mdui:Description xml:lang="sv">
+                Webgränssnittet till HR-systemet Primula (Test-miljö) från EVRY HR Solutions AB för anställda vid LNU
+            </mdui:Description>
+        <mdui:Description xml:lang="en">
+                The web interface to the HR software system Primula (test) from EVRY HR Solutions AB for employees at LNU
+            </mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
+MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
+Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
+JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
+ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
+Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
+S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
+ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
+c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
+oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
+pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
+SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
+8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
+gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
+tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-lnu.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-lnu.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-lnu.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://test-lnu.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://test-lnu.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>primulasupport@evry.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index 3e43cb62..81d50574 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -101,9 +101,10 @@ R+DVLFswqfvJvRRyTA==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Wiberg</md:SurName>
-    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+    <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>