Resolves SWAMIDOPS-1428 and SWAMIDOPS-1430

5 files changed, 401 insertions, 90 deletions

diff --git a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
new file mode 100644
index 00000000..0ac62d4d
--- /dev/null
+++ b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://konto-test.test.hb.se/Shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <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://konto-test.test.hb.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://konto-test.test.hb.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://konto-test.test.hb.se/Shibboleth.sso/DS/ds-test.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://konto-test.test.hb.se/Shibboleth.sso/DS/ds-test.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://konto-test.test.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
+      <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://konto-test.test.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
+      <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://konto-test.test.hb.se/Shibboleth.sso/https://hbidp-test.hb.se/idp/profile/Shibboleth/SSO"/>
+      <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://konto-test.test.hb.se/Shibboleth.sso/https://hbidp-test.hb.se/idp/profile/Shibboleth/SSO"/>
+      <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://konto-test.test.hb.se/Shibboleth.sso/https://hbidp-test.hb.se/idp/profile/Shibboleth/SSO"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Konto TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Konto TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testserver för applikationen Konto, som skapar identiteter på Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Testserver for the application Konto, which provides identities at the University of Borås.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>hbsp-test.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp-test.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID/TCCAmWgAwIBAgIJAJXxIZ8hzubRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMTEmhic3AtdGVzdC5hZC5oYi5zZTAeFw0xODA4MTUxMDAzMDRaFw0yODA4MTIx
+MDAzMDRaMB0xGzAZBgNVBAMTEmhic3AtdGVzdC5hZC5oYi5zZTCCAaIwDQYJKoZI
+hvcNAQEBBQADggGPADCCAYoCggGBAKpwRrE5j42Jku0JU5hbk/GISqjlSmZ5c5Xq
+a0zYBlZPdmYf4K3hVqeUZtK+f2MHE+RZ/M8Xe4ujBvi+KAebSK1f43b/A1+sTQ3Q
+VNuKHu2wNMOy/f/F5IOHaU3H97TG2dirI2hNasG/lQjheIzcrqPAZAlak+CbjAQe
+WNPuyeHtdab9yNllo51zefOt57e3+DfQRY5JOSasmEzhn7BD7Io6P8T4IqDE3viN
+j7uJDmjuEoMHQfXqXuBkNmdbpC/x43u9zOi6FLqjuLlUNNXeYbe6+JGWPHIZZWpw
+10EE52VUo/DqvUFLpW8DQx8dTTTuDVfpkWlNobY7DG6uMVz7KxlPPkzRojZdaU+Z
+IzeAoLgAMnLLf18hBkKdx6Kq/RDH5+4pJCo9y1os1o5tljH80p2+03+Z0rFkApnH
+4G3hnoXaDXnGfm3n0sSMjpvSQ3xhPH1fLHTfJD9IOYgNufWQqrX//61t/HVmoJZZ
+d0RPjU+uL2ahfVQNN4wZkFAYgSudLQIDAQABo0AwPjAdBgNVHREEFjAUghJoYnNw
+LXRlc3QuYWQuaGIuc2UwHQYDVR0OBBYEFETbzt7ILuBVhr6N12meu0FA6OrnMA0G
+CSqGSIb3DQEBCwUAA4IBgQAwjkyU1ADuMjfRiIfF2oHhKghlYyNyWI+UopYkuFS9
+QK+446eydGTRH+sp5LIoB6ylcm588Mn5uVmgNBNkqrEMXYOtbtN8hugfSAMuJTJj
+HEazh3eKpa/PYArmFotw4kLtgtVtYk6gRo6ZKtKXe+Vmgf+eFEbHMTn2i6fsDu7t
+9aDtZNzt1beSdU51awn8wn9jdD7aN9iT9GZ4RNAXU93UaFE+dy9EpC0nd0NNxsLn
+AJnEYrFEZus4XFG0aUGzcZReWQi5C/ryUmXeq93H/Dt82rKfWn/Jg4dKg33vu0Ol
+49WDxOfjUNFXTckw7SmDm2iKNwUZns7/E11Pvt/Sa/Kzo/xccO3dZ0ESLbhlL0sd
+cDAenuSelj4GWkExkn8JJu+Gf4tF454KHdjGHNv4760astFtWDLMcQwFgVW0CDXq
+9z5dsTa3vVJHsD7aUAtDd8TIECi1QmsknXZPEN9kyCYLN1b4+THk8NPw8lfeMA44
+WBZx2UHH2lrrPqfxaKVb5Hg=
+</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>hbsp-test.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp-test.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID/TCCAmWgAwIBAgIJAL9+yfqa7IrTMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMTEmhic3AtdGVzdC5hZC5oYi5zZTAeFw0xODA4MTUxMDAzMDNaFw0yODA4MTIx
+MDAzMDNaMB0xGzAZBgNVBAMTEmhic3AtdGVzdC5hZC5oYi5zZTCCAaIwDQYJKoZI
+hvcNAQEBBQADggGPADCCAYoCggGBALoOTNyoPj98HZ4b6KLXLDBYbQkngcZvvVVV
+3R51n/1lTQaX2kAUz+YQOmuMLerC5IT6jKtMbZVACvsAd+NayU8a/0LRPTWcYOb+
+PnQkfnmmkF2n2Z4QM/MxBg8h2jiJGwe7yp+lkeq45kK2nD24T9OvMRbIGk7SLmUL
+bSusKOBCH2ocdYoGgWlQRqSCxUqkZk9/SRv6+gy0o0ienBpId/XqHAZPDSuqJowd
+3MVUugg+jTB6/VFrXuAGNTDcHj21t3A9lqszaw2DeSi3od6uZavF3RRBES+UibLF
+38DPObY1Btj9UgFwtaGGpt/Fty/P1wfSEThtUtEqX8vp4aNpMt0cQrOWjtt/jS2x
+FPLD0OZWZEEPgGWIGry5jYcJyIpXZAi3O+A8zuu5ut2PmEuBREYHPAcR1GC6lwO4
+kcjf5nfa9p0+Xqu0sfUMUrkNimTAW8ZBL9Ui47J5cuK609euvzWGhpb7ZoZf8Zm0
+xbHoLjIuzgx2n9qGknooPdGMlpA4EQIDAQABo0AwPjAdBgNVHREEFjAUghJoYnNw
+LXRlc3QuYWQuaGIuc2UwHQYDVR0OBBYEFBPVp6ERIb5I5Bgw4s5kLQLl+dWvMA0G
+CSqGSIb3DQEBCwUAA4IBgQA93kI4yMEiTRsu4Wksbmy5YYl/Lt1LyGQlfr7SZ5zI
+T/aSqSMCQcPtYkCEKxM17/aoz13oiHlWNQYG4svWPXiqc2gEjXCLF1+bioh0twjA
+Yx7zR8wY8QaVDfeh7VnD8LghY7RXZqa7GF31R/AYDdZiBDTJpUAeO9jcm1rG0joa
+DwovI7x+QQnQl8ih1TUJrAoCvOhYFuwfsk6hx3p/TMQGH3u+OBTw7qI7uHJbuO+q
+/ZX/fZR7mHGf/nymkz+dcPRxwnnFejmMVNNEZOoJALsQ4pb9P5kj0Lz3uCVYRwU7
+qrL5L+3Pne1mG7tV/lslSzk4ZUYo7BYyfZvWWcSviM9NrjFbui34/6zQYQ10/Bl0
+UcEA4vIpBduB2fzrSZnW72982wC2aeHLIvDs/CajaLmjhPQnEewZkWziQ4q5q+vu
+zqdUcSW0Cpp6aNAo5dcLWlzV04thXrj8dxfYKXXYosrkQx+ltGRawbcqsEhjlp7/
+jdkRrWzWFJhSCRj04tS0Oyw=
+</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://konto-test.test.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/konto.hb.se-shibboleth.xml b/swamid-2.0/konto.hb.se-shibboleth.xml
new file mode 100644
index 00000000..245abb1e
--- /dev/null
+++ b/swamid-2.0/konto.hb.se-shibboleth.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://konto.hb.se/Shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <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://konto.hb.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://konto.hb.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://konto.hb.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://konto.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
+      <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://konto.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
+      <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://konto.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Konto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Konto</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Applikation för att skapa identiteter på Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Application to provide identities at the University of Borås.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAN3NZDofjibUMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM4WhcNMjgxMTAyMTI1MTM4
+WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEA0s7wHBYSHfIIQBBF+yQ5ketWsLspmRlhouWOiyoe0oXC8QfV
+JzGi48C81pY4gFy+FGr9PRWfNMSVgXlNWsHl6wXjA0zVuS01rXp/Lha0+2WEQN91
+DfQBlQpTv7B5l/oP2cWCavEUnxD63eGDz3zEpuFP2wOrYLMto5sI7OYT7bhheh6d
+ycDgkHrNBCQP0FldotREUm5sfJJbptkj3a2Hj10Ir+hlPbGM0vXhlUIsxnixI4iZ
+RtCA9lzZPQIzIv+L5a3R9bGrbBoTRig75yLLuWaGQ+kGrDzdVoxaIFFdRrA5jm12
+ErRZgsYrXKcmRwzr8veXodSy8sNNtdgPyOrEtEEWsHIEuKuGqKhJECKXgJJuZhdN
+hhV8G6Ye+EwcfmN6gU0uJlib7MpoyqaHxLMLopbeBRhK5012BswD/RaffG62SYQv
+hyASyaecjpiowdDp7m20Tn5f59kiLySd3P+pZOK4touohGMgmRvfHr0yqxi8fWaG
+hqbNc8KVnWhJiu3HAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
+HQYDVR0OBBYEFO0DzgqpZgPzeb70K4I60lLqDYwwMA0GCSqGSIb3DQEBCwUAA4IB
+gQB/m/HLPYbKZFK85Mmp1EzC4EASv8PggxUJ8o5uYFqifPAotmJtgvXJPOPNy9m0
+EsL2cGYmWMiqwaio6ZbibNZurHbFW25aQFzpxFgDAmjV31z929lOjupRtcJIPsHZ
+ywMFrS85Y8FTZnzdx9QEDY9JQN6smHhPX57aEUrY/gEyWE3M89jKiLy4SnAFxU9R
+iJOBL1L2FzLJuw9r4RpWVpE+/8azUExWkX3Dg4ETGVGdFUs/mdkna7is4ivRGZ35
+q682hBadypi91PD2ztzeFApV4w1xuXUv6hRd31Q1tqACbsMuA9MVp9d+hgmT3nFR
+Di7GpTrX3L27qcAEyvbNlLFlf5MEKn60QJiVEFPRvBL+r4pp56tahFm2pbYkbIZh
+7xGFvHck6j5t8Jkw8eaNeFxQ0BH9VXGDwGDqHXai7mqeOmHS9PnpVdWNmX0tNtQn
+bJWhml0emo2rBoAqqVRmo/WwLpfc1g3HEinDgC/5sOefPZL1fLGwbrQKtL1qnSnl
+sQU=
+</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>hbsp.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAKdew3mrNlhLMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM3WhcNMjgxMTAyMTI1MTM3
+WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEArUL46WChMTf3h8AgkcmQaxDHV2kogN7jg0qDGR30zg5Le/4C
+dsGSKusBInRqy3GnRLIxONNIwM+dw5NPtZNpNLR/o2Sul1SIDIsTvxjQXzbNGok1
+cl9lc3+Xuid4ipTGmsbUULmHddNgArCziQf8IywFBFVoR/pCCWVlN270dNWHTSdz
+cXtZw2NcON+hBfkSanj2U34HVhoaOzqH5m1lW7VfwbbaSpugcMUNvgy8GGCCsQXW
+7NXVNJ33GbZZPqs35NLRh6WRCxDs+Zl2r6+Uc27HdjLQGsjqz1JdsYU07BRCXvBx
+KAWAQ+RExAU+HMB/gNTaPjwVKb9MH5JYm6euuHF9UomQCmNkjxUK/k2wtKIpxHDc
+4EwCD11GqsxoWG8FHl9CF4hr3aGx36vSYexcXYeUJAAtzbWKUBpSfjAlYpghvW9a
+ypNvgkIB3YX636LVl65dLH59SXA2Z3gNUNKemHzb/Cg/TgdQjzuA8M5+mzogXG0J
+c5Si7H2FNJZAFUObAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
+HQYDVR0OBBYEFMsWUqTNQAcoUU5dTxont01sMKI3MA0GCSqGSIb3DQEBCwUAA4IB
+gQCg/km6kEbsjayx+HocSm7TNlxQz7kWxCC54KeXctt3tx7woYDgkSDHbIDTFIxE
+1tqkHxC27wpXpYou9Lm8JGKiwSAvxM3xtsQIALXnQq2apvQUiw+Yhnd8Izx+32Um
+57Ula85OjlNJI0ivWlAQRUwGxE/WxI5OQirfz/uF1/3kmbRdvzMXnpg1BXkzKrCP
+IWoka2Ls/2iC6cj7TgYJjIZD8FpXXnXLJO64kNC/G2dCn64UbX4OHTF0hAWiM/08
+ijxAGulhwUnM66L0JNrQu/44TqNjm0wj4NKsuMv9Gvs4PUP9+y/usdbKuayx12C8
+lWJf1RHEt6es9Q31UpwJoAdxYj24t6uZQvuCPFRNwjD3KUzdrGEP8L/kscrv4BXH
+jPdlx+R5JLMrmgvgFfj5pbb4sMThV9c+YG8X7NhO0KSpF+3tcm4d2ALJX4PwCZYr
+ZIWp0BkfmRasnk1z1GK1MwMYhdPFKVm6ummbW82AcJgnBz1kGRvB1NQ/8BwjPIHx
+toA=
+</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://konto.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.hb.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.hb.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index da4e7be2..e613c203 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -1,22 +1,22 @@
 <?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="http://selfservice.hb.se/Shibboleth">
-  <md:Extensions>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://selfservice.hb.se/Shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
@@ -25,58 +25,85 @@
       </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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://selfservice.hb.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://selfservice.hb.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://selfservice.hb.se/Shibboleth.sso/DS/ds.swamid.se"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://selfservice.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://selfservice.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
-      <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://konto.hb.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://konto.hb.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://konto.hb.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://konto.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://admin.konto.hb.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://admin.konto.hb.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://admin.konto.hb.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin.konto.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://doorsign.hb.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://doorsign.hb.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://doorsign.hb.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://doorsign.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://konto.hb.se/Shibboleth.sso/WAYF/shibboleth.antagning.se"/>
-      <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://konto.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
-      <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://konto.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
-      <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://admin.konto.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
-      <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://doorsign.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
+      <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://selfservice.hb.se/Shibboleth.sso/WAYF/login.idp.eduid.se"/>
+      <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://selfservice.hb.se/Shibboleth.sso/https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">SelfService</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SelfService</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Självhjälp för användare vid Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Self service application for users at University of Borås.</mdui:Description>
+        <mdui:Description xml:lang="sv">SelfService applikation.</mdui:Description>
+        <mdui:Description xml:lang="en">SelfService application.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://selfservice.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://selfservice.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>selfservice.hb.se</ds:KeyName>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>hbsp.ad.hb.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=selfservice.hb.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAIOlrvIgcUjoMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNlbGZzZXJ2aWNlLmhiLnNlMB4XDTEzMDYyNTExMjkyM1oXDTIzMDYyMzEx
-MjkyM1owHDEaMBgGA1UEAxMRc2VsZnNlcnZpY2UuaGIuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDqkYHEieVsu7WKxqfHompkA2lR3/MqFWH2mn0T
-sFXsx+FyhUN2alKQq+/uAOrq8BRFawWQrcUsr8AWvZBoh3S1UitdNREHFLMU0iu8
-UwV+UmVe9fHnwgoLHT0FpX4XZB7UXODB/SYILTLIdzKFdDfeXjBWjvHQdtuAjHbE
-GSS4s83I3Yc4sKMlhKWicx+1pdeKXcR0a4682Lce1drAxhx0yV0Q2PE7yQqyV/qK
-raGrotxTKvz/o8mi4sBeRLq/vmzTHj6xFPS7+HZxLH0yKxU7UCsp1ickj5gMn8c/
-Qi+0lpHikE/AjWbkvKrxtp1DEuqJq3VgBOBfkyw/nx+LJQTLAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNlbGZzZXJ2aWNlLmhiLnNlMB0GA1UdDgQWBBTvH6RjfNFoGGp+
-I4CYWpgQxH93DzANBgkqhkiG9w0BAQUFAAOCAQEAYU08XX+YHeBrGFTcM2GzPLFX
-2M32BT7w0uYo+4u9gzHIZZYMLtfMJRhHPRASC5URS+JQawf7jF51iAQgEF8BEoAT
-OUg0QoBLPfOyjxbjH8ptnLge9u40vjnYHfZdl+MoVLgqkOJa44JaxGsJg910mF20
-WDdIUwNBQkJN2Yf0T5naxXzJY5s23kFk1kvVODkl82B9DgMyCnvVAI2Vclmzv8co
-3Lwxw2wW1J89Jcz4u0d1fEzFP5RtFEyozwiSCsOLbM/4hS7h8Mh7sX3rrb9bzQIK
-JiEYVlHMJBAwzl9O8U5S35FL0p5iFCCIEvwgoNzeaktYyd0JXC847Y75LM1RcA==
+          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAN3NZDofjibUMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM4WhcNMjgxMTAyMTI1MTM4
+WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEA0s7wHBYSHfIIQBBF+yQ5ketWsLspmRlhouWOiyoe0oXC8QfV
+JzGi48C81pY4gFy+FGr9PRWfNMSVgXlNWsHl6wXjA0zVuS01rXp/Lha0+2WEQN91
+DfQBlQpTv7B5l/oP2cWCavEUnxD63eGDz3zEpuFP2wOrYLMto5sI7OYT7bhheh6d
+ycDgkHrNBCQP0FldotREUm5sfJJbptkj3a2Hj10Ir+hlPbGM0vXhlUIsxnixI4iZ
+RtCA9lzZPQIzIv+L5a3R9bGrbBoTRig75yLLuWaGQ+kGrDzdVoxaIFFdRrA5jm12
+ErRZgsYrXKcmRwzr8veXodSy8sNNtdgPyOrEtEEWsHIEuKuGqKhJECKXgJJuZhdN
+hhV8G6Ye+EwcfmN6gU0uJlib7MpoyqaHxLMLopbeBRhK5012BswD/RaffG62SYQv
+hyASyaecjpiowdDp7m20Tn5f59kiLySd3P+pZOK4touohGMgmRvfHr0yqxi8fWaG
+hqbNc8KVnWhJiu3HAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
+HQYDVR0OBBYEFO0DzgqpZgPzeb70K4I60lLqDYwwMA0GCSqGSIb3DQEBCwUAA4IB
+gQB/m/HLPYbKZFK85Mmp1EzC4EASv8PggxUJ8o5uYFqifPAotmJtgvXJPOPNy9m0
+EsL2cGYmWMiqwaio6ZbibNZurHbFW25aQFzpxFgDAmjV31z929lOjupRtcJIPsHZ
+ywMFrS85Y8FTZnzdx9QEDY9JQN6smHhPX57aEUrY/gEyWE3M89jKiLy4SnAFxU9R
+iJOBL1L2FzLJuw9r4RpWVpE+/8azUExWkX3Dg4ETGVGdFUs/mdkna7is4ivRGZ35
+q682hBadypi91PD2ztzeFApV4w1xuXUv6hRd31Q1tqACbsMuA9MVp9d+hgmT3nFR
+Di7GpTrX3L27qcAEyvbNlLFlf5MEKn60QJiVEFPRvBL+r4pp56tahFm2pbYkbIZh
+7xGFvHck6j5t8Jkw8eaNeFxQ0BH9VXGDwGDqHXai7mqeOmHS9PnpVdWNmX0tNtQn
+bJWhml0emo2rBoAqqVRmo/WwLpfc1g3HEinDgC/5sOefPZL1fLGwbrQKtL1qnSnl
+sQU=
+</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>hbsp.ad.hb.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hbsp.ad.hb.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID7jCCAlagAwIBAgIJAKdew3mrNlhLMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMTDWhic3AuYWQuaGIuc2UwHhcNMTgxMTA1MTI1MTM3WhcNMjgxMTAyMTI1MTM3
+WjAYMRYwFAYDVQQDEw1oYnNwLmFkLmhiLnNlMIIBojANBgkqhkiG9w0BAQEFAAOC
+AY8AMIIBigKCAYEArUL46WChMTf3h8AgkcmQaxDHV2kogN7jg0qDGR30zg5Le/4C
+dsGSKusBInRqy3GnRLIxONNIwM+dw5NPtZNpNLR/o2Sul1SIDIsTvxjQXzbNGok1
+cl9lc3+Xuid4ipTGmsbUULmHddNgArCziQf8IywFBFVoR/pCCWVlN270dNWHTSdz
+cXtZw2NcON+hBfkSanj2U34HVhoaOzqH5m1lW7VfwbbaSpugcMUNvgy8GGCCsQXW
+7NXVNJ33GbZZPqs35NLRh6WRCxDs+Zl2r6+Uc27HdjLQGsjqz1JdsYU07BRCXvBx
+KAWAQ+RExAU+HMB/gNTaPjwVKb9MH5JYm6euuHF9UomQCmNkjxUK/k2wtKIpxHDc
+4EwCD11GqsxoWG8FHl9CF4hr3aGx36vSYexcXYeUJAAtzbWKUBpSfjAlYpghvW9a
+ypNvgkIB3YX636LVl65dLH59SXA2Z3gNUNKemHzb/Cg/TgdQjzuA8M5+mzogXG0J
+c5Si7H2FNJZAFUObAgMBAAGjOzA5MBgGA1UdEQQRMA+CDWhic3AuYWQuaGIuc2Uw
+HQYDVR0OBBYEFMsWUqTNQAcoUU5dTxont01sMKI3MA0GCSqGSIb3DQEBCwUAA4IB
+gQCg/km6kEbsjayx+HocSm7TNlxQz7kWxCC54KeXctt3tx7woYDgkSDHbIDTFIxE
+1tqkHxC27wpXpYou9Lm8JGKiwSAvxM3xtsQIALXnQq2apvQUiw+Yhnd8Izx+32Um
+57Ula85OjlNJI0ivWlAQRUwGxE/WxI5OQirfz/uF1/3kmbRdvzMXnpg1BXkzKrCP
+IWoka2Ls/2iC6cj7TgYJjIZD8FpXXnXLJO64kNC/G2dCn64UbX4OHTF0hAWiM/08
+ijxAGulhwUnM66L0JNrQu/44TqNjm0wj4NKsuMv9Gvs4PUP9+y/usdbKuayx12C8
+lWJf1RHEt6es9Q31UpwJoAdxYj24t6uZQvuCPFRNwjD3KUzdrGEP8L/kscrv4BXH
+jPdlx+R5JLMrmgvgFfj5pbb4sMThV9c+YG8X7NhO0KSpF+3tcm4d2ALJX4PwCZYr
+ZIWp0BkfmRasnk1z1GK1MwMYhdPFKVm6ummbW82AcJgnBz1kGRvB1NQ/8BwjPIHx
+toA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -91,44 +118,30 @@ JiEYVlHMJBAwzl9O8U5S35FL0p5iFCCIEvwgoNzeaktYyd0JXC847Y75LM1RcA==
       <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://selfservice.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.konto.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://doorsign.hb.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://selfservice.hb.se/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://selfservice.hb.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://selfservice.hb.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.konto.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.konto.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.konto.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.konto.hb.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://doorsign.hb.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://doorsign.hb.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doorsign.hb.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doorsign.hb.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://selfservice.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://selfservice.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://konto.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://konto.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.konto.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://admin.konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.konto.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.konto.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doorsign.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doorsign.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doorsign.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doorsign.hb.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doorsign.hb.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a34ea051..55b7c452 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -739,4 +739,5 @@
   <xi:include href="swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml"/>
   <xi:include href="swamid-2.0/slltest2.luvit.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/stillalive.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/konto.hb.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index ec57116f..748120db 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -38,4 +38,5 @@
   <xi:include href="swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml"/>
   <xi:include href="swamid-2.0/uppsala-test.blackboard.com-lms.xml"/>
   <xi:include href="swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/konto-test.test.hb.se-shibboleth.xml"/>
 </EntitiesDescriptor>