ki sp:s added

ki sp:s updated
ki sp:s removed
ki idp mdui added
SWAMIDOPS-6934

8 files changed, 100 insertions, 91 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 27722735..e5fe6681 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -152,8 +152,6 @@
   <xi:include href="swamid-1.0/www.servicedesk.its.umu.se.xml"/>
   <xi:include href="swamid-1.0/umdac-olho0001.ad.umu.se.xml"/>
   <xi:include href="swamid-1.0/www.wisum.its.umu.se.xml"/>
-  <xi:include href="swamid-1.0/kiladokdev.it.ki.se.xml"/>
-  <xi:include href="swamid-1.0/kiladoktest.it.ki.se.xml"/>
   <xi:include href="swamid-1.0/lpw.ki.se.xml"/>
   <xi:include href="swamid-1.0/nordunet.tv.xml"/>
   <xi:include href="swamid-1.0/mailfilter.nordu.net.xml"/>
diff --git a/swamid-1.0/kiladokdev.it.ki.se.xml b/swamid-1.0/kiladokdev.it.ki.se.xml
deleted file mode 100644
index d48acc05..00000000
--- a/swamid-1.0/kiladokdev.it.ki.se.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiladokdev.it.ki.se/shibboleth">
-  <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://kiladokdev.it.ki.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://kiladokdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kiladokdev.it.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kiladokdev.it.ki.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAMp62nwgYW3jMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2tpbGFkb2tkZXYuaXQua2kuc2UwHhcNMTEwNTA2MDk0MzI0WhcNMjEwNTAz
-MDk0MzI0WjAeMRwwGgYDVQQDExNraWxhZG9rZGV2Lml0LmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxM8SLReq15M/D/J0ETBYZvMTVMpeno0B
-5d/ax2AOsJPn/4rzzVTTtIMroxr8yXKZ0RIxg+WsBqsNzhTEvzHa850rs0fZ9vkn
-mYWzBR13XFI0e6bS3jmqw5qFLQP6AsQ4Nfnw+BJILpRZSAVa9dTdfuAMGWT5t3VO
-6BgSvoxFgnvewR1yHuwZwnyHd3wqQIXlL7AibGSf+yoeCmatDueEn563ScU/62E6
-EBFcQFPC0vLC8w6XVwD4wVKyZXeTGG5fR4TUPeg6DaNc+jod59A9x6L0SZSMRqpe
-oaAy2xTIY1aVYi6KAnDI2Zo+Aqazi9S8v+V7Euzhkq81M4s8fZDvgwIDAQABo0Ew
-PzAeBgNVHREEFzAVghNraWxhZG9rZGV2Lml0LmtpLnNlMB0GA1UdDgQWBBTNYLed
-xgm2UWlp89Kv854gx1F84TANBgkqhkiG9w0BAQUFAAOCAQEAqnJVmyJnj6/6C5uC
-2K7FhlIyNm4sgzh+OzirRbGg+5P/hCUzv9AbjVyichts8L1BGdRrDTd6alWAe8jo
-molQUIizH5+reZIql9bjGCOkbrhTVLmzx8Tv4jCa202nXdrAazzBpbYf8JYGGSep
-D68STfoiiCfJrq2tiHPLhyaRthmHIP+kpG3QLNnWfg5T6f+gfDy6/EKnFDAD+oSq
-T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
-1ykeP8ZFUW1tLe1vSfWMX7xVAPRLKPHDVHcANNvpncnz+Qb/RyXRAyEXnpNNurRQ
-9c/C1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kiladokdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-1.0/kilwdev.it.ki.se.xml b/swamid-1.0/kilwdev.it.ki.se.xml
index fef2975f..69df0b77 100644
--- a/swamid-1.0/kilwdev.it.ki.se.xml
+++ b/swamid-1.0/kilwdev.it.ki.se.xml
@@ -2,10 +2,10 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilwdev.it.ki.se/shibboleth">
   <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="http://kilwdev.it.ki.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="http://kilwdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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="http://kilwdev.it.ki.se/Shibboleth.sso/Login" index="2"/>
-      <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="http://kilwdev.it.ki.se/Shibboleth.sso/Login" index="3"/>
+      <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://kilwdev.it.ki.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://kilwdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
+      <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://kilwdev.it.ki.se/Shibboleth.sso/Login" index="2"/>
+      <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://kilwdev.it.ki.se/Shibboleth.sso/Login" index="3"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -33,16 +33,16 @@ T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://kilwdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://kilwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kilwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-1.0/lpw.ki.se.xml b/swamid-1.0/lpw.ki.se.xml
index cd5941fb..4e9762b9 100644
--- a/swamid-1.0/lpw.ki.se.xml
+++ b/swamid-1.0/lpw.ki.se.xml
@@ -4,6 +4,12 @@
     <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://lpw.ki.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://lpw.ki.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">LPW - Karolinska Institutet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">LPW - Karolinska Institutet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Ladok på webb för studenter på Karolinska Institutet</mdui:Description>
+        <mdui:Description xml:lang="en">Ladok on the web for students at Karolinska Institutet</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-1.0/lpwdev.it.ki.se.xml b/swamid-1.0/lpwdev.it.ki.se.xml
index 64b412af..4397ce9e 100644
--- a/swamid-1.0/lpwdev.it.ki.se.xml
+++ b/swamid-1.0/lpwdev.it.ki.se.xml
@@ -2,9 +2,9 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpwdev.it.ki.se/shibboleth">
   <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="http://lpwdev.it.ki.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="http://lpwdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
-      <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="http://lpwdev.it.ki.se/Shibboleth.sso/Login" 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://lpwdev.it.ki.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://lpwdev.it.ki.se/Shibboleth.sso/Login" index="1"/>
+      <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://lpwdev.it.ki.se/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -32,16 +32,16 @@ T3KdvO0Zx0+2keQLPgImrfPgNtMK9mcLeYwjopvXGfABSJ77OKER8alPcW1NVQM9
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://lpwdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://lpwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwdev.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpwdev.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kilwtest.it.ki.se-shibboleth.xml b/swamid-2.0/kilwtest.it.ki.se-shibboleth.xml
new file mode 100644
index 00000000..cfa28bdd
--- /dev/null
+++ b/swamid-2.0/kilwtest.it.ki.se-shibboleth.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilwtest.it.ki.se/shibboleth">
+  <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://kilwtest.it.ki.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://kilwtest.it.ki.se/Shibboleth.sso/Login" index="1"/>
+      <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://kilwtest.it.ki.se/Shibboleth.sso/Login" index="2"/>
+      <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://kilwtest.it.ki.se/Shibboleth.sso/Login" index="3"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>kiladoktest01.it.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=kiladoktest01.it.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAMJ9LjHSUsvoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmtpbGFkb2t0ZXN0MDEuaXQua2kuc2UwHhcNMTEwNTI2MTMyNTMzWhcNMjEw
+NTIzMTMyNTMzWjAhMR8wHQYDVQQDExZraWxhZG9rdGVzdDAxLml0LmtpLnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOUmjHK3EDwdhiUDbm9oW/u8
+n/ksrSapvbz+TTMQ70a01QHdcU1d48Dq2rjOVUpiZvV+SVjrSsSaqoTW6X0jUwgO
+nzQZayVMGia9x5Y0zphksK0RIXrcZhN34zamHyg+ioVqumZWVfaXbfkDUphfJ25E
++HzioYe9pzr+dWeS0bTMQ6kcgI+KZqVfpKYeNn/6c5zgfYFUy8lp7pYr5yRr7HKM
+xbezT7PTdMIXwqI291G4VaTed/jDFOtYInMI3nGcg1U75TjMxbJIjDl24hWMxb3t
+WP1vAQvQDhTYuAPaQZq/FPCYWBbbKmHUG2RcquSWYullHwvWgRnzXi04/8luwQID
+AQABo0QwQjAhBgNVHREEGjAYghZraWxhZG9rdGVzdDAxLml0LmtpLnNlMB0GA1Ud
+DgQWBBTm4IeB4clBD5Xy65Su9mR25oz94DANBgkqhkiG9w0BAQUFAAOCAQEApjAT
+ZMzYK0b21AfhOC4ELmXzRIG7tjEqpG1S2KGjTML3OPQ3iqY0+6NH5ihcG7L5U+Ot
+S3HswID9RV4fRkvB2HJ1cBDSH8DbCCi6LyYydJPfJloYJ/AdrumlJQDVJRNyYD6T
+53on7zeJaKv3n9eJrhqdnoEy0ofJtTAydbEx+F3AT3tW+jjpo5biuyuOa6W0wv0J
+DICtfX5UbSz96NxJbSCjoD23hMXqMOcUT3Pllk1MuPeK18rxZWy8qwxVk+E/haLr
+OaQPhM+ucEz0I/gHI37mAyzAz8w9PSTjwN+GKKngB+8IcdOQcUVRIhhTtu+ukBjR
+e01/KT+BtiGpAdoAUA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwtest.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kilwtest.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-1.0/kiladoktest.it.ki.se.xml b/swamid-2.0/lpwtest.it.ki.se-shibboleth.xml
index 8dbe8f6e..3f32eef6 100644
--- a/swamid-1.0/kiladoktest.it.ki.se.xml
+++ b/swamid-2.0/lpwtest.it.ki.se-shibboleth.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiladoktest.it.ki.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lpwtest.it.ki.se/shibboleth">
   <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://kiladoktest.it.ki.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://kiladoktest.it.ki.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://lpwtest.it.ki.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://lpwtest.it.ki.se/Shibboleth.sso/Login" index="1"/>
+      <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://lpwtest.it.ki.se/Shibboleth.sso/Login" index="2"/>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -31,16 +32,16 @@ e01/KT+BtiGpAdoAUA==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kiladoktest.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwtest.it.ki.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lpwtest.it.ki.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 988928c6..8f7cce93 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -74,4 +74,6 @@
    <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/>
    <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/>
    <xi:include href="swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml"/>
+   <xi:include href="swamid-2.0/kilwtest.it.ki.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/lpwtest.it.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>