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

3 files changed, 79 insertions, 77 deletions

diff --git a/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml b/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
index a34980f7..2a89a0ec 100644
--- a/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ladok3-idp.its.umu.se:444/proxy-sp/metadata.xml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://dev-idp-lab.utv.ladok.se/proxy-sp/metadata.xml">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-26T09:06:33Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
@@ -12,50 +12,51 @@
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ladok3-idp.its.umu.se:444/proxy-sp/disco" 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://dev-idp-lab.utv.ladok.se/proxy-sp/disco" index="1"/>
       <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Proxy-IdP for login during Ladok development (lab)</mdui:Description>
-        <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks utvecklingsmiljöer (lab)</mdui:Description>
+        <mdui:Description xml:lang="en">Proxy-IdP for login during Ladok development</mdui:Description>
+        <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks utveckling</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">Ladok development proxy-IdP dev</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Ladok utveckling proxy-IdP dev</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ladok development proxy-IdP (lab)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Ladok utveckling proxy-IdP (lab)</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFazCCA1OgAwIBAgIUMyu4IEClpjTN+IV+dodB10V8m4EwDQYJKoZIhvcNAQEL
-BQAwRTEVMBMGA1UECgwMcHJveHktaWRwIHNwMQwwCgYDVQQLDANkZXYxHjAcBgNV
-BAMMFWxhZG9rMy1pZHAuaXRzLnVtdS5zZTAeFw0yMTEwMDYxMzM3MDJaFw0zMTEw
-MDQxMzM3MDJaMEUxFTATBgNVBAoMDHByb3h5LWlkcCBzcDEMMAoGA1UECwwDZGV2
-MR4wHAYDVQQDDBVsYWRvazMtaWRwLml0cy51bXUuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDPEh11keYGa8FjopBAtNa0L6OuQ8f35zqSfF0uNWlY
-o6C6I7jTWQqwqsDsI0aH68RKl0DX65bbUTtoGBROwGHbWkzMWUTG9AucAEgE9r9b
-srDkE4IEarir5Lv7Ze30aEXd6jZYmUVv62X9F1U79xer7bsImi/5hJ06s34BSeQ6
-9aU5NWRaWHtdPoyx/1vab0xvLRxm1oQP/CjdAXJqDRbikNdGm9kjGmy/aEBwtc1V
-igKsaz1Xxxdd+n9uCqfBvLYVXB+1Dn1ZOubmjNIeIB+O0S9ywIqO5mS5FGAdYBw1
-uKlSlYZ2XRiXlqQiF8mFrsRdD6J39ibJBrvsxtAhjAaddKePyOLUiKKqH6ZIl2QR
-BYYkxwqyPo1Wx7XnJ0mkPNNBfFGCRP0cmMbSbbjCxfi/EPKqH8eY1dcaqqSbbbCd
-ZksWjTvOEzpBnOwzOf22enaQ8QWVDE/EAtTbvztWPqeC6yjvmxjujLGgI3UqAGO1
-+bqbfQt9ZD8Pdm4A/7irzmv8iSRXP8rB+l4aE3tW3huUPRYwwgsCQiF4x3VVI0x4
-l582kvrQx8S3SbblsmtXVgF4MHs21O2TjRZ4BUMGN62n2JQmEJjoIqbnp48dBvnv
-P0XbyyWGZ90xBDRFgaBqlPEnqPeQoyEWr8Esl/sYuAnScuMO9eIWW0rN7CGXMZ/t
-BQIDAQABo1MwUTAdBgNVHQ4EFgQUE0/+zxKXE3EAmUd1fJz9Nb6XnuswHwYDVR0j
-BBgwFoAUE0/+zxKXE3EAmUd1fJz9Nb6XnuswDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAgEAHA7frw8C1nBjPvCgSmB/WBb+TsLs0826/BzDW0zHDuuL
-6BQopnKiyID5IP92GuYv/RTJfkFAPhd0Q8P6rgaSDPK2FGCzxCvMKL39oypPHDVk
-QcVcsaIwYaLZXNBCPDeeLVsgL5C+sRZeNt/X0ViGapaZ2+xSjE+t2AwSohFgbVL/
-UNi4CJVIlK6MFVg5hE9tb6BAQuZT0hJwgARiJe0IIC6K5jAROngD491ikrEmO9TG
-hGm9em/C91oJewvuYKuj3b80/PgAcOFNIwbQn/axDvpDM3cGNjLokACM5i3nCgmc
-oP80bVfTNTpt305vB7iWdCBFmHcIm8VroTs1fLqmQ6u3qXiNolcw/q8mkBH/NrQW
-MTrYkqztPFZBRpchtCyOS92lLjrcdtDTQGvswbIbzh1XHBtX+KiHdlhS67qvUjjV
-2bSbhXtYLGtViYQjoHvkQyLyEqD0+7vIByAO2VpIF5CamLR58jDsjjLbx407ni71
-lMkOdeYtENT0Tq8WSWNKxI+rcbsXYk6XQ2QLN1Oukk1qJ5F4f+NZHUXblqE/ip3x
-25l6GJ7PRM5kTo5m7umYYwfnWNYyI4v+qblQ1ZEZoUGOUUNCX+Q3SRNBNj/0g6/q
-r3TFsTJAu0X8Bnf1f9dHlj8iKm3sUHrRKbJ6traoq5C7mIPXXT3cWv8THCj/B+E=
+          <ds:X509Certificate>
+MIIFVTCCAz2gAwIBAgIUO2WZqQCsMf38V9VNymZa6o4gna4wDQYJKoZIhvcNAQEL
+BQAwOjEVMBMGA1UECgwMcHJveHktaWRwIHNwMSEwHwYDVQQDDBhkZXYtaWRwLWxh
+Yi51dHYubGFkb2suc2UwHhcNMjIwMTIxMDYyNzI5WhcNMzIwMTE5MDYyNzI5WjA6
+MRUwEwYDVQQKDAxwcm94eS1pZHAgc3AxITAfBgNVBAMMGGRldi1pZHAtbGFiLnV0
+di5sYWRvay5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAONGOfpL
+JxR4NqovfWHQxDy3sc4pgP1IcB/OZG33tuT/UblDMGr9cb5PGe+T/Age/jrV3fkl
+4452kpdXxN3swIGPk1xAdjA6IjEEMJKZbk/k0mjPbSTO36ujoAi0MdArSg2e/HfZ
+SkCxWpYihaw8FT8XqzVWXWMN6LlagGQZZ6MHC4BlqLpCoWrBRcMYfs330j+xvr5F
+7HYF1Tx16jji9XhdKcpXPgaJ5V4STe2EjmlZTEeerlOIL9Fg9ZTxfNDJLDIRTOz4
+4hnRZiFCPk5JZSV2MG2AxwmxQiOZK53dpnK3/5gHHzO24+G8nwLZfCjwsCgPuTnZ
+kJ6/1+jpHCF0xzVKj6bBezGsXcE7UIDavd+YH5k1SNBCJ9yesbkbO8IjRCE4ml5T
+ux/vI90RMl5igL4jyMOo5DspGDi1ywlXxafqySVCM6b2h2Sn98gqkx4KqVHVVxeR
+MYNU1V4f/CNYWzuutd3mQpvXdJ98HvOBM7utueGcmg3KG6mM7UoAZk3XDb1C9kEP
+y8x4H4x96SOd2NeTMgMXpDyDjxo89QJWkIgiK5jENN7nRG4z0LmUFt8eVWLfOlnG
+XJBh+fo/xLUyMfW8DfG2OE4brj9X7TQGbC9yH/TbO1WhIGAcgmnMD5Kna2rm5JHl
+Fg07lXnMtwLnKIi2qj2k2Lv0IX+GW9fKhSH7AgMBAAGjUzBRMB0GA1UdDgQWBBQz
+4QVtVw75qIZZKyUOJtq+oKlduzAfBgNVHSMEGDAWgBQz4QVtVw75qIZZKyUOJtq+
+oKlduzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQDXWlnrnBnO
+oEpKyUequOjAD0DqIN5TW/bro+YPX8BFhTgeRrC4Ksigo02lVtxOBuYxf+M6fLLL
+Z6uNApNDL+dkupKDhHVLxS9ogE59OuiJB+rHFfCKJwM9thCnuk56jQ+Dec9l0F1x
+FhC9iAy1TTjSFGC/21WKTBSu6GyzoTyWx0bgR8XdYnOESM0MvGm4ntbLRP8MKxAF
+wKaMWNbXWu9mFy8a4e52wx7TYdkQaPl5v76pE6ovTlXLzY8EOtp8KaBnslwgK0rM
+wRv6Fi1Fru+a/LkJOR7DMIu33T5S2KaWGYuhAXlYagWQjuqCFlDNqIzEQrtRpUPC
+jVAZFy+WYCLxjQxJbSJqxw6Fsbp53RpUm0Z5RULfiny9/kMrBpiD2KXuAaKmzzLE
+GFZkeVgNXM6x+nocw+wNPL+hHqFryBFq42Mxg35V+wXHRtRW3ZA84dZUG/FA52sK
+LmteGjHvrW5hG3FnttQrlj1RI4H499XgS3RRLcfim+5r5+z49Vr0eG+Mr4AH13qr
+sL3Jlus1o2K+nQT5FqfK3+FU+Z+MM0arXtVC94+WEjVFs6A/cpQNCKMfWJKMG2ri
+R/zP9G+/fQq6GAjrxUSPW0fFSGu9k3K2jSB1kY7dZgwhHqiXqbOHXkw+iov3rB1K
+WdMLKixMaF7Vggu7L05EeKCLm2QR2qRNqg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -63,75 +64,76 @@ r3TFsTJAu0X8Bnf1f9dHlj8iKm3sUHrRKbJ6traoq5C7mIPXXT3cWv8THCj/B+E=
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIFazCCA1OgAwIBAgIUMyu4IEClpjTN+IV+dodB10V8m4EwDQYJKoZIhvcNAQEL
-BQAwRTEVMBMGA1UECgwMcHJveHktaWRwIHNwMQwwCgYDVQQLDANkZXYxHjAcBgNV
-BAMMFWxhZG9rMy1pZHAuaXRzLnVtdS5zZTAeFw0yMTEwMDYxMzM3MDJaFw0zMTEw
-MDQxMzM3MDJaMEUxFTATBgNVBAoMDHByb3h5LWlkcCBzcDEMMAoGA1UECwwDZGV2
-MR4wHAYDVQQDDBVsYWRvazMtaWRwLml0cy51bXUuc2UwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDPEh11keYGa8FjopBAtNa0L6OuQ8f35zqSfF0uNWlY
-o6C6I7jTWQqwqsDsI0aH68RKl0DX65bbUTtoGBROwGHbWkzMWUTG9AucAEgE9r9b
-srDkE4IEarir5Lv7Ze30aEXd6jZYmUVv62X9F1U79xer7bsImi/5hJ06s34BSeQ6
-9aU5NWRaWHtdPoyx/1vab0xvLRxm1oQP/CjdAXJqDRbikNdGm9kjGmy/aEBwtc1V
-igKsaz1Xxxdd+n9uCqfBvLYVXB+1Dn1ZOubmjNIeIB+O0S9ywIqO5mS5FGAdYBw1
-uKlSlYZ2XRiXlqQiF8mFrsRdD6J39ibJBrvsxtAhjAaddKePyOLUiKKqH6ZIl2QR
-BYYkxwqyPo1Wx7XnJ0mkPNNBfFGCRP0cmMbSbbjCxfi/EPKqH8eY1dcaqqSbbbCd
-ZksWjTvOEzpBnOwzOf22enaQ8QWVDE/EAtTbvztWPqeC6yjvmxjujLGgI3UqAGO1
-+bqbfQt9ZD8Pdm4A/7irzmv8iSRXP8rB+l4aE3tW3huUPRYwwgsCQiF4x3VVI0x4
-l582kvrQx8S3SbblsmtXVgF4MHs21O2TjRZ4BUMGN62n2JQmEJjoIqbnp48dBvnv
-P0XbyyWGZ90xBDRFgaBqlPEnqPeQoyEWr8Esl/sYuAnScuMO9eIWW0rN7CGXMZ/t
-BQIDAQABo1MwUTAdBgNVHQ4EFgQUE0/+zxKXE3EAmUd1fJz9Nb6XnuswHwYDVR0j
-BBgwFoAUE0/+zxKXE3EAmUd1fJz9Nb6XnuswDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAgEAHA7frw8C1nBjPvCgSmB/WBb+TsLs0826/BzDW0zHDuuL
-6BQopnKiyID5IP92GuYv/RTJfkFAPhd0Q8P6rgaSDPK2FGCzxCvMKL39oypPHDVk
-QcVcsaIwYaLZXNBCPDeeLVsgL5C+sRZeNt/X0ViGapaZ2+xSjE+t2AwSohFgbVL/
-UNi4CJVIlK6MFVg5hE9tb6BAQuZT0hJwgARiJe0IIC6K5jAROngD491ikrEmO9TG
-hGm9em/C91oJewvuYKuj3b80/PgAcOFNIwbQn/axDvpDM3cGNjLokACM5i3nCgmc
-oP80bVfTNTpt305vB7iWdCBFmHcIm8VroTs1fLqmQ6u3qXiNolcw/q8mkBH/NrQW
-MTrYkqztPFZBRpchtCyOS92lLjrcdtDTQGvswbIbzh1XHBtX+KiHdlhS67qvUjjV
-2bSbhXtYLGtViYQjoHvkQyLyEqD0+7vIByAO2VpIF5CamLR58jDsjjLbx407ni71
-lMkOdeYtENT0Tq8WSWNKxI+rcbsXYk6XQ2QLN1Oukk1qJ5F4f+NZHUXblqE/ip3x
-25l6GJ7PRM5kTo5m7umYYwfnWNYyI4v+qblQ1ZEZoUGOUUNCX+Q3SRNBNj/0g6/q
-r3TFsTJAu0X8Bnf1f9dHlj8iKm3sUHrRKbJ6traoq5C7mIPXXT3cWv8THCj/B+E=
+          <ds:X509Certificate>
+MIIFVTCCAz2gAwIBAgIUO2WZqQCsMf38V9VNymZa6o4gna4wDQYJKoZIhvcNAQEL
+BQAwOjEVMBMGA1UECgwMcHJveHktaWRwIHNwMSEwHwYDVQQDDBhkZXYtaWRwLWxh
+Yi51dHYubGFkb2suc2UwHhcNMjIwMTIxMDYyNzI5WhcNMzIwMTE5MDYyNzI5WjA6
+MRUwEwYDVQQKDAxwcm94eS1pZHAgc3AxITAfBgNVBAMMGGRldi1pZHAtbGFiLnV0
+di5sYWRvay5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAONGOfpL
+JxR4NqovfWHQxDy3sc4pgP1IcB/OZG33tuT/UblDMGr9cb5PGe+T/Age/jrV3fkl
+4452kpdXxN3swIGPk1xAdjA6IjEEMJKZbk/k0mjPbSTO36ujoAi0MdArSg2e/HfZ
+SkCxWpYihaw8FT8XqzVWXWMN6LlagGQZZ6MHC4BlqLpCoWrBRcMYfs330j+xvr5F
+7HYF1Tx16jji9XhdKcpXPgaJ5V4STe2EjmlZTEeerlOIL9Fg9ZTxfNDJLDIRTOz4
+4hnRZiFCPk5JZSV2MG2AxwmxQiOZK53dpnK3/5gHHzO24+G8nwLZfCjwsCgPuTnZ
+kJ6/1+jpHCF0xzVKj6bBezGsXcE7UIDavd+YH5k1SNBCJ9yesbkbO8IjRCE4ml5T
+ux/vI90RMl5igL4jyMOo5DspGDi1ywlXxafqySVCM6b2h2Sn98gqkx4KqVHVVxeR
+MYNU1V4f/CNYWzuutd3mQpvXdJ98HvOBM7utueGcmg3KG6mM7UoAZk3XDb1C9kEP
+y8x4H4x96SOd2NeTMgMXpDyDjxo89QJWkIgiK5jENN7nRG4z0LmUFt8eVWLfOlnG
+XJBh+fo/xLUyMfW8DfG2OE4brj9X7TQGbC9yH/TbO1WhIGAcgmnMD5Kna2rm5JHl
+Fg07lXnMtwLnKIi2qj2k2Lv0IX+GW9fKhSH7AgMBAAGjUzBRMB0GA1UdDgQWBBQz
+4QVtVw75qIZZKyUOJtq+oKlduzAfBgNVHSMEGDAWgBQz4QVtVw75qIZZKyUOJtq+
+oKlduzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQDXWlnrnBnO
+oEpKyUequOjAD0DqIN5TW/bro+YPX8BFhTgeRrC4Ksigo02lVtxOBuYxf+M6fLLL
+Z6uNApNDL+dkupKDhHVLxS9ogE59OuiJB+rHFfCKJwM9thCnuk56jQ+Dec9l0F1x
+FhC9iAy1TTjSFGC/21WKTBSu6GyzoTyWx0bgR8XdYnOESM0MvGm4ntbLRP8MKxAF
+wKaMWNbXWu9mFy8a4e52wx7TYdkQaPl5v76pE6ovTlXLzY8EOtp8KaBnslwgK0rM
+wRv6Fi1Fru+a/LkJOR7DMIu33T5S2KaWGYuhAXlYagWQjuqCFlDNqIzEQrtRpUPC
+jVAZFy+WYCLxjQxJbSJqxw6Fsbp53RpUm0Z5RULfiny9/kMrBpiD2KXuAaKmzzLE
+GFZkeVgNXM6x+nocw+wNPL+hHqFryBFq42Mxg35V+wXHRtRW3ZA84dZUG/FA52sK
+LmteGjHvrW5hG3FnttQrlj1RI4H499XgS3RRLcfim+5r5+z49Vr0eG+Mr4AH13qr
+sL3Jlus1o2K+nQT5FqfK3+FU+Z+MM0arXtVC94+WEjVFs6A/cpQNCKMfWJKMG2ri
+R/zP9G+/fQq6GAjrxUSPW0fFSGu9k3K2jSB1kY7dZgwhHqiXqbOHXkw+iov3rB1K
+WdMLKixMaF7Vggu7L05EeKCLm2QR2qRNqg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-idp.its.umu.se:444/proxy-sp/acs/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-idp-lab.utv.ladok.se/proxy-sp/acs/post" index="1"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Ladok development proxy-IdP dev</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Ladok utveckling proxy-IdP dev</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:ServiceName xml:lang="en">Ladok development proxy-IdP (lab)</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok utveckling proxy-IdP (lab)</md:ServiceName>
       <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: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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Ladokkonsortiet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ladokkonsortiet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  <md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
diff --git a/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml b/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
index dd9d01f3..977b7b61 100644
--- a/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
@@ -102,8 +102,8 @@ gL7Pmj+wCIaPgKIgLqqFDAc=
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-idp.utv.ladok.se/proxy-sp/acs/post" index="1"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Ladok support proxy-IdP</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Ladok support proxy-IdP</md:ServiceName>
+      <md:ServiceName xml:lang="en">Ladok development proxy-IdP</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Ladok utveckling proxy-IdP</md:ServiceName>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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: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"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 53cfb1d5..201ce134 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -671,7 +671,6 @@
   <xi:include href="swamid-2.0/jss.kau.se-8443-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/>
-  <xi:include href="swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/su-graylog.cnaas.sunet.se.xml"/>
   <xi:include href="swamid-2.0/mdh-graylog.cnaas.sunet.se.xml"/>
@@ -714,4 +713,5 @@
   <xi:include href="swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml"/>
   <xi:include href="swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/kb-se.zoom.us-new.xml"/>
+  <xi:include href="swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml"/>
 </md:EntitiesDescriptor>