SWAMID-876 – 881, SWAMID-884 Updated idp.hb.se, hbidp-test.test.hb.se, konto-test.test.hb.se, konto.hb.se, selfservice-test.test.hb.se, selfservice.hb.se, play.hb.se

8 files changed, 247 insertions, 177 deletions

diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
index 4a873052..67f0c46f 100644
--- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
@@ -5,18 +5,18 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://hbidp-test.test.hb.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://hbidp-test.test.hb.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Högskolan i Borås - Test</mdui:DisplayName>
@@ -29,6 +29,8 @@
         <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hb.se/genvagar/om-webbplatsen/integritetspolicy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hb.se/en/shortcuts/about-the-site/privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>hb.se</mdui:DomainHint>
@@ -55,8 +57,8 @@
         <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -81,8 +83,8 @@ HeJFPfMchJSIf4t2ui7XHSfm5/U=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -107,8 +109,8 @@ ulMd7RBwYluu5OV3k9qVEF28oA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -133,21 +135,21 @@ YPbGFDgtXE/LKeKsvKgyQIfKUW8=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp-test.test.hb.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp-test.test.hb.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp-test.test.hb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -172,8 +174,8 @@ HeJFPfMchJSIf4t2ui7XHSfm5/U=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -198,8 +200,8 @@ ulMd7RBwYluu5OV3k9qVEF28oA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -224,33 +226,40 @@ YPbGFDgtXE/LKeKsvKgyQIfKUW8=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@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:it@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:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company> University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index 23d93291..82b95b24 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -5,18 +5,18 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hb.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hb.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
@@ -29,6 +29,8 @@
         <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hb.se/en/shortcuts/about-the-site/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hb.se/genvagar/om-webbplatsen/integritetspolicy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>hb.se</mdui:DomainHint>
@@ -55,8 +57,8 @@
         <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -80,8 +82,8 @@ aNzNVJS43oE8N/RPT9WEW3649pid7xIH08GlKoSWS9h7nQ3mmpqN/5GSCU3mSkFB
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -105,8 +107,8 @@ tYvY9KtsWRS4ptxG7wPFhpTS16I=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -130,25 +132,25 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hb.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -172,8 +174,8 @@ aNzNVJS43oE8N/RPT9WEW3649pid7xIH08GlKoSWS9h7nQ3mmpqN/5GSCU3mSkFB
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -197,8 +199,8 @@ tYvY9KtsWRS4ptxG7wPFhpTS16I=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -222,31 +224,38 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@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:it@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:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-Shibboleth.xml
index 099509b1..0b9902c3 100644
--- a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto-test.test.hb.se-Shibboleth.xml
@@ -131,26 +131,40 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <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:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">konto-test.hb.se</md:ServiceName>
+      <md:ServiceName xml:lang="sv">konto-test.hb.se</md:ServiceName>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@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:it@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:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/play.hb.se.xml b/swamid-2.0/play.hb.se.xml
index 7475532d..3a0141a4 100644
--- a/swamid-2.0/play.hb.se.xml
+++ b/swamid-2.0/play.hb.se.xml
@@ -7,8 +7,6 @@
     <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:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -19,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">HB Play</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Högskolan i Borås playtjänst</mdui:Description>
         <mdui:Description xml:lang="en">University of Borås play service</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hb.se/en/shortcuts/about-the-site/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hb.se/genvagar/om-webbplatsen/integritetspolicy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -48,15 +50,23 @@
     <md:OrganizationURL xml:lang="sv">https://www.hb.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
+    <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
+    <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:it@hb.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml b/swamid-2.0/selfservice-test.test.hb.se-Shibboleth.xml
index 49daeb07..0c3c664c 100644
--- a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice-test.test.hb.se-Shibboleth.xml
@@ -129,27 +129,41 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">selfservice-test.hb.se</md:ServiceName>
+      <md:ServiceName xml:lang="sv">selfservice-test.hb.se</md:ServiceName>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@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:it@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:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </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 6a4626af..e42b899a 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-Shibboleth.xml
@@ -129,27 +129,41 @@ toA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AttributeConsumingService index="1">
       <md:ServiceName xml:lang="en">selfservice.hb.se</md:ServiceName>
+      <md:ServiceName xml:lang="sv">selfservice.hb.se</md:ServiceName>
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT</SurName>
-    <EmailAddress>mailto:it@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Borås</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.hb.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>University of Borås</md:Company>
+    <md:SurName>IT</md:SurName>
+    <md:EmailAddress>mailto:it@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:it@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:it@hb.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>University of Borås</md:Company>
+    <md:GivenName>IRT HB</md:GivenName>
+    <md:EmailAddress>mailto:csirt@hb.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f878e65f..467577ab 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -23,7 +23,7 @@
   <xi:include href="swamid-2.0/rems.csc.fi.xml"/>
   <xi:include href="swamid-2.0/ugit.se-sp.xml"/>
   <xi:include href="swamid-2.0/sgw.africa-grid.org-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/selfservice.hb.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/selfservice.hb.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/expert.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index ffc398c0..52fa4f13 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -26,8 +26,8 @@
   <xi:include href="swamid-2.0/sp.haikom.com-saml-kph-test.xml"/>
   <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"/>
+  <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"/>
   <xi:include href="swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-01.its.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml"/>