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

11 files changed, 221 insertions, 57 deletions

diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh
index 55f33ec7..aa105e8e 100755
--- a/scripts/get-metadata.sh
+++ b/scripts/get-metadata.sh
@@ -45,9 +45,19 @@ else
 	if [ -s "${metadataurl}" ]; then
 		metadata=`cat "$metadataurl"`
 	else
-		urls="https://${metadataurl}/idp/shibboleth https://${metadataurl}/Shibboleth.sso/Metadata https://${metadataurl}/saml/index/sp-metadata https://${metadataurl}/saml/metadata https://${metadataurl}/federationmetadata/2007-06/federationmetadata.xml https://metadata.swamid.se/?rawXML=${metadataurl}"
+		case $metadataurl in
+			[0-9][0-9]*)
+				urls="https://metadata.swamid.se/?rawXML=${metadataurl}"
+				;;
+			http*)
+				urls="$metadataurl"
+				;;
+			*)
+				urls="https://${metadataurl}/idp/shibboleth https://${metadataurl}/Shibboleth.sso/Metadata https://${metadataurl}/saml/index/sp-metadata https://${metadataurl}/saml/metadata https://${metadataurl}/federationmetadata/2007-06/federationmetadata.xml"
+				;;
+		esac
 		for i in ${urls}; do
-			metadata=`curl -L -s -k -f "${i}"`
+			metadata=`curl -L -m 5 -s -k -f "${i}"`
 			[ -n "${metadata}" ] && break
 		done
 	fi
@@ -88,6 +98,7 @@ case $x in
 
 		echo "$metadata" > $entityidfn
 		tmp=`mktemp`
+		xsltproc --stringparam regDate $(perl $script_cwd/../scripts/now_date.pl) $script_cwd/../xslt/add-rpi.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
 		xsltproc $script_cwd/../xslt/clean-entitydescriptor.xsl ${entityidfn} > ${tmp} && mv ${tmp} ${entityidfn}
 
 		if $new ; then
diff --git a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml b/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
index c8b404d4..d78e3e8a 100644
--- a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
+++ b/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
@@ -135,7 +135,8 @@ imI7fKJp6ilQ9FahRA==
       <md:ServiceName xml:lang="en">Ladok integrator's portal</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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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: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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml b/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
index 8c078815..f4cc5c92 100644
--- a/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
+++ b/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
@@ -91,6 +91,8 @@ aeTtz7U=</ds:X509Certificate>
       <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="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-2.0/kau-se.zoom.us.xml b/swamid-2.0/kau-se.zoom.us.xml
index 4dc10190..ab46b024 100644
--- a/swamid-2.0/kau-se.zoom.us.xml
+++ b/swamid-2.0/kau-se.zoom.us.xml
@@ -1,13 +1,11 @@
 <?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="kau-se.zoom.us">
+<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://kau-se.zoom.us">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-12-05T13:07:15Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-01-19T06:33:19Z">
       <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">
       <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -19,11 +17,89 @@
         <mdui:DisplayName xml:lang="en">KAU Zoom</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Detta är Karlstads universitets e-mötesverktyg</mdui:Description>
         <mdui:Description xml:lang="en">This is Karlstad University's E-Meeting service</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.kau.se/student/meny/it-stod/distans/zoom</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.kau.se/en/student/menu/it-support/distance-studies/zoom</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://privacypolicy.hotell.kau.se/zoom/sv.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://privacypolicy.hotell.kau.se/zoom/en.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
+          <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
+QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
+AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
+bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMojahRTgictiNEB+fQXIFnxZEqgygvhCJn0Hov4IVM6e7a+
+dMJo1VQsgExMB1PSanNvbs5CSmnH4rOSdA3QZrLqV388aXXDYTnMaWj+sgFPlVWUTRGU7cg/v3gX
+NONYAjnspYkKPSevw9hogchfNKIb22oFhKqcEW6Om8l6uWoBuA5iOV6xD0pK5kz6tCQZT+/XgAkc
+RYflPyHSJcne50ETOltttnrronSf9mRDV3GuO6jinR3vrjoPBxJRHvCIzbwtrFFtxbJtZxvDDwoj
+W+1N0zxIKuqDDbNz2xV5ljc+O50MrrpNNAhrK43MhJFCnDnpVa7mD/hnhvjXDxakUJMCAwEAAaOC
+A2owggNmMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBTOCRYgvopA
+dEFLhLr0FUufc47Z7zASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
+ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
+cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
+bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
+b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
+QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIB
+agFoAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+KAVBygAABAMARzBFAiEA
+rtfeQ99OhmoaWWW6C+cEOoOwXwrZMDaJXhsoGdOy1jgCICAfL+l2WkJ9B1lKb6D93rWANj2voiga
+BEy6CCj+fI7/AHUANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+KAVCFQAABAMA
+RjBEAiBOxbNBm8bHEcz+AJiSLW6RP2pZUzxJRmUjwaJlXN44sQIgJDKdCUMn4GFo80idD135JaqJ
+LorDPfSBDvL73t+Yu6cAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAX4oBUI0
+AAAEAwBIMEYCIQDbkQO7Uq7yq+s2zHu++WzuhtKVEDkeVzfStZVWDBHgBgIhAMcTpkfrd/b9RI8/
+k48BrNXLnVJX1o4Qw5tTuPvAvmk2MA0GCSqGSIb3DQEBCwUAA4IBAQAog8XzmWnid9A/wtsn6abK
+yPNFFss7YhPgWY0PnBpbnvxQVeP5oCDU/3YecyaXbm0CiY4dEH22EV5nNVgSVLPcZud75W3VVYlV
+DhZtmTIEGF6FnYv1Q1tek0Okgf03XdKWwODqYSY+3FwaBa6cON6Vw7bhVRVl3KuMtuH5vSJP2rAE
+lYhdyaErrG3nwskUpqIZ9wwmjXRQW6705G5yk3Y6vRqoRefSbO7QqTxABvwGh23GDhyiW+rkibU2
+VKj5OfOwlyK5N91EbZUfLsO2U9hg//ZdOJMmxvpO6UgZBmd7TjOdYM8Nkr9CBB1Jm1+CgfqrQgeL
+mYIp+qov+EzUDeCQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
+QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
+AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
+bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMojahRTgictiNEB+fQXIFnxZEqgygvhCJn0Hov4IVM6e7a+
+dMJo1VQsgExMB1PSanNvbs5CSmnH4rOSdA3QZrLqV388aXXDYTnMaWj+sgFPlVWUTRGU7cg/v3gX
+NONYAjnspYkKPSevw9hogchfNKIb22oFhKqcEW6Om8l6uWoBuA5iOV6xD0pK5kz6tCQZT+/XgAkc
+RYflPyHSJcne50ETOltttnrronSf9mRDV3GuO6jinR3vrjoPBxJRHvCIzbwtrFFtxbJtZxvDDwoj
+W+1N0zxIKuqDDbNz2xV5ljc+O50MrrpNNAhrK43MhJFCnDnpVa7mD/hnhvjXDxakUJMCAwEAAaOC
+A2owggNmMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBTOCRYgvopA
+dEFLhLr0FUufc47Z7zASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
+ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
+cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
+bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
+b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
+QVNIQTI1NjIwMjBDQTEtMS5jcnQwDAYDVR0TAQH/BAIwADCCAX4GCisGAQQB1nkCBAIEggFuBIIB
+agFoAHYA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+KAVBygAABAMARzBFAiEA
+rtfeQ99OhmoaWWW6C+cEOoOwXwrZMDaJXhsoGdOy1jgCICAfL+l2WkJ9B1lKb6D93rWANj2voiga
+BEy6CCj+fI7/AHUANc8ZG7+xbFe/D61MbULLu7YnICZR6j/hKu+oA8M71kwAAAF+KAVCFQAABAMA
+RjBEAiBOxbNBm8bHEcz+AJiSLW6RP2pZUzxJRmUjwaJlXN44sQIgJDKdCUMn4GFo80idD135JaqJ
+LorDPfSBDvL73t+Yu6cAdwCzc3cH4YRQ+GOG1gWp3BEJSnktsWcMC4fc8AMOeTalmgAAAX4oBUI0
+AAAEAwBIMEYCIQDbkQO7Uq7yq+s2zHu++WzuhtKVEDkeVzfStZVWDBHgBgIhAMcTpkfrd/b9RI8/
+k48BrNXLnVJX1o4Qw5tTuPvAvmk2MA0GCSqGSIb3DQEBCwUAA4IBAQAog8XzmWnid9A/wtsn6abK
+yPNFFss7YhPgWY0PnBpbnvxQVeP5oCDU/3YecyaXbm0CiY4dEH22EV5nNVgSVLPcZud75W3VVYlV
+DhZtmTIEGF6FnYv1Q1tek0Okgf03XdKWwODqYSY+3FwaBa6cON6Vw7bhVRVl3KuMtuH5vSJP2rAE
+lYhdyaErrG3nwskUpqIZ9wwmjXRQW6705G5yk3Y6vRqoRefSbO7QqTxABvwGh23GDhyiW+rkibU2
+VKj5OfOwlyK5N91EbZUfLsO2U9hg//ZdOJMmxvpO6UgZBmd7TjOdYM8Nkr9CBB1Jm1+CgfqrQgeL
+mYIp+qov+EzUDeCQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
           <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIQCLgQc9Z8Mn06Q0tiGbaLyjANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQG
 EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIg
 VExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjEwMTMwMDAwMDAwWhcNMjIwMjAyMjM1OTU5WjBz
@@ -91,16 +167,21 @@ U7U1sUyCVwFp2Z7D3xnz+erklZPsBxecF7mTebgi9XUUUJDiEA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kau-se.zoom.us/saml/SingleLogout" ResponseLocation="https://kau-se.zoom.us/saml/SingleLogout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kau-se.zoom.us/saml/SingleLogout" ResponseLocation="https://kau-se.zoom.us/saml/SingleLogout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
     <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:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kau-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kau-se.zoom.us/saml/SSO" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kau-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KAU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">KAU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.kau.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.kau.se/en</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
@@ -109,4 +190,8 @@ U7U1sUyCVwFp2Z7D3xnz+erklZPsBxecF7mTebgi9XUUUJDiEA==</ds:X509Certificate>
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml b/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml
index 0d4c3688..a34980f7 100644
--- a/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml
@@ -112,10 +112,10 @@ r3TFsTJAu0X8Bnf1f9dHlj8iKm3sUHrRKbJ6traoq5C7mIPXXT3cWv8THCj/B+E=
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <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:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml b/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
index 0df47da2..de702406 100644
--- a/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/ladok3-idp.its.umu.se-proxy-sp-metadata.xml.xml
@@ -112,10 +112,10 @@ inTy+LsdM4MFwpiV7d4EZi89Aw==
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
+    <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:OrganizationDisplayName xml:lang="en">Ladok Consortium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ladok.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://ladok.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
index dabda993..80ea63ee 100644
--- a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
@@ -5,10 +5,8 @@
       <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">
-      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -19,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">Ladok3 Jenkins login</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Inloggning mot Ladok3 Jenkins</mdui:Description>
         <mdui:Description xml:lang="en">Login to Ladok3 Jenkins</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:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -88,20 +90,47 @@ unedWltx</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-jenkins-master.ladok.umu.se/securityRealm/finishLogin" index="0"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LED Jenkins login</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Inloggning LED Jenkins</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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: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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Anders Sigfridsson</md:SurName>
-    <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <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="technical">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Anders Sigfridsson</md:SurName>
-    <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
+    <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:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Anders Sigfridsson</md:SurName>
-    <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
+    <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="administrative">
+    <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 xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
index 9f458c99..cd85cfdc 100644
--- a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
@@ -5,10 +5,8 @@
       <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">
-      <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -19,6 +17,10 @@
         <mdui:DisplayName xml:lang="en">Ladok3 Stage Jenkins login</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Inloggning mot Ladok3 Stage Jenkins</mdui:Description>
         <mdui:Description xml:lang="en">Login to Ladok3 Stage Jenkins</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:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -86,20 +88,47 @@ AWJszdmP9pFByUcRfp1aOrpdIb0eLkHL5uzGdw==</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-jenkins-stage.ladok.umu.se/securityRealm/finishLogin" index="0"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LED Jenkins login</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Inloggning LED Jenkins</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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: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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Anders Sigfridsson</md:SurName>
-    <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <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="technical">
-    <md:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Anders Sigfridsson</md:SurName>
-    <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
+    <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:Company>ITS, Umea universitet</md:Company>
-    <md:SurName>Anders Sigfridsson</md:SurName>
-    <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
+    <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="administrative">
+    <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 xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>ITS, Umeå universitet</md:Company>
+    <md:SurName>Ladok-supporten</md:SurName>
+    <md:EmailAddress>mailto:ladokincident@its.umu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46907866600</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 43f5c631..5eb88e2b 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -22,7 +22,7 @@
     <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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <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>
@@ -37,6 +37,8 @@
         <mdui:Description xml:lang="en">ladok3.its.umu.se login</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">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:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -92,10 +94,18 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">ladok3.its.umu.se login</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Inloggning ladok3.its.umu.se</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"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ladok</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ladok</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Ladok Consortium</md:OrganizationName>
+    <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="sv">https://ladok.se/</md:OrganizationURL>
diff --git a/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml b/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
index be27c14a..16ec5052 100644
--- a/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
+++ b/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
@@ -20,10 +20,8 @@
         <mdui:Description xml:lang="sv">Proxy-IdP för inloggning i Ladoks support</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://ladok.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://ladok.se/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="98" width="96">https://www.start.ladok.se/logo/ladok_en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="98" width="96">https://www.start.ladok.se/logo/ladok_sv.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ladok.se/transfer-of-personal-data-to-ladok-when-using-federated-login</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok.se/overforing-av-personuppgifter-till-ladok-i-samband-med-federerad-inloggning</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://ladok3.its.umu.se/privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ladok3.its.umu.se/privacy-policy/index-en.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -113,7 +111,6 @@ yPoIQ1Flc8ORgIcmUzQYhlzEF4PxMZgnag==
       <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="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2cf2ca70..198e2dc3 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -466,7 +466,6 @@
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml"/>
   <xi:include href="swamid-2.0/isoffan.sprakochfolkminnen.se.xml"/>
   <xi:include href="swamid-2.0/sse.instructure.com-saml2.xml"/>
-  <xi:include href="swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/exitpoll.jbtst.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/sunet.instructure.com-saml2.xml"/>
@@ -484,7 +483,6 @@
   <xi:include href="swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lu.beta.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/lu.test.instructure.com-saml2.xml"/>
-  <xi:include href="swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/uu-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/uppsala.instructure.com-saml2.xml"/>
@@ -716,4 +714,6 @@
   <xi:include href="swamid-2.0/acc.nais.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/medlem.dalastudent.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml"/>
+  <xi:include href="swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml"/>
+  <xi:include href="swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml"/>
 </md:EntitiesDescriptor>