SWAMID-2309, SWAMID-2310, SWAMID-2311 Updated wikiu.its.uu.se wiki2.its.uu.se and wiki.its.uu.se

3 files changed, 135 insertions, 75 deletions

diff --git a/swamid-2.0/wiki.its.uu.se-shibboleth.xml b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
index e690c1e0..1e1e0262 100644
--- a/swamid-2.0/wiki.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
@@ -9,34 +9,46 @@
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.its.uu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IT Division Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki</mdui:Description>
-        <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">ITS wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ITS Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">ITS wiki är en intern dokumentationsplattform för driftsdokumentation vid Avdelningen för universitetsgemensam IT vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">ITS wiki is an internal documentation platform for operations-related documentation at University IT Services at Uppsala University.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864207641&amp;l=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864207641&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864207641&amp;l=sv</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864207641&amp;l=sv</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
-ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
-lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
-VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
-MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
-xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
-KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
-HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
-WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
-T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
-TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
-d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
-XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
-oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIE5zCCAs+gAwIBAgIJAPy99YriNVxRMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
+BAMTCndpa2kudXUuc2UwIBcNMjIxMjEzMTUwODA3WhgPMjEyMjExMTkxNTA4MDda
+MBUxEzARBgNVBAMTCndpa2kudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDin/hZDUTkgLdghSZZ2gIxjVOImBOdWgpKL2iKky1Z2cGVEzf8/Ypz
+tEMmM8b5qhSAxGOBl1lr8n1mXVNGP0TUovO7YvnL+8fGBDAAhqlOoEg+mo3z1JGS
+trrZQytX0tmpgH/mUGBWCletr86AphsAaS7M3ZX/OfEVwemFzWrXOQ66lYyy8tOW
+RssWeQ6v5s3Yg1pW1mSsVZNUEb737ZtZNk8QhtLjUOyE1NDcAN8teVJ47mxckhk2
+21sIcSAvDwgAnKTAlBlurDb30O+pKjZ0vGGygvDT/gc6iT1d1FdOJ/zLPz5aJxxY
+SdLwD1eRyHu+6ilMvuQmKfjbXsYrduS32udGmeFDaYv2LIcHBR7O3LBTBNWt1z7E
++WRZJNicvyTgHU1ytnehr/DnCrg3I9foDhrJEhYdpb96VLoDtJ3i9yaxhP3XxERZ
+wbXQU6DIeZzWNpZM1gh0STfzin5me3YjBNJzEbli24qM/3kZuvaJrPRhW1mJ1UOw
+qK85o/fThto+heNG4NQv6y4Og/35cQZ9G9a5f86puFP1/rXGyH+aFnEqdi+7v4Aa
+cZ3v1hcRGkgoSeyATWPz9b34yPmINiO7d0ib17q8yUqhqaCRaRAavXoGCJWndKet
+BEAtHhm1AInVix0FrG51vWTf0+riqg/y6sHklnDHq5Wg+POLS4wUYwIDAQABozgw
+NjAVBgNVHREEDjAMggp3aWtpLnV1LnNlMB0GA1UdDgQWBBQnZRIwN1UrME2OD77+
+1A5weVePPTANBgkqhkiG9w0BAQsFAAOCAgEAYCMxLwK3+GTOo0VGaK1KmLrLU+3X
+GsUYWP67+cFV/lcklERQmFsCEar21xyvHxbRCdsuMz3E7yqj1Wo9GAA0WAinTRsQ
+zBkPvzW0mIRZcmMoOA4+R8X0+Qqzi3bdhdzla5HKPmtj3sCGp7tG3OKAezV75VBm
+IoMzayV6lMcG/L0dX/4KHqfXmR1jjU4rezYFkMuUHxRyvBIesxYWRplhjT8DnBlR
+jO9UpaJWJjpQ/VasBdmEbSiV2IRo8ofx5+Nc414gzIXsZTEZ9XkXMQygKqrkOLK9
+Aoi56u81h2daGI4IK0WMM8HR6K4Hc8ICJZ7kD1o/sDaqxLkD8Nkn4vhFBq9sEr4M
+uyx4cul3sLimqdiP2LRnJMq6WCHAPb3vdZHVMmimX3skXqDKuuCq5m9PVnEQNUqR
+Yk9jSBNeKNT4ptrJSYvoC49R93pS0YBLr/Uv0VGprjwkYAVrMTAB6dY7XgGX+h+f
+P2ESYDUpPGSgFX/MkbPngClmb3p/fLLHfy5x3iLUKud9MMqgotx19cC8t9R68BFm
+Q/lPja2t6j7ql7LZGiZGNN0yRtASl32tZlHlwaDhOnjYwOTtSIjnsqXicnn0EKer
++AqXmoRomlcGOAEzIUhVn4cQ8PcuzYjNb8FAwXv4HcxDoNVDXvgc8scfm5gWYQ/6
+/4GVFFu09/oBhbs=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -59,15 +71,23 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
index 3210e46e..1d388ddd 100644
--- a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
@@ -9,34 +9,46 @@
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki2.its.uu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki (RESERV)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IT Division Wiki (BACKUP)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki (RESERV)</mdui:Description>
-        <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University (BACKUP)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">ITS wiki (BACKUP)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ITS Wiki (BACKUP)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">ITS wiki är en intern dokumentationsplattform för driftsdokumentation vid Avdelningen för universitetsgemensam IT vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">ITS wiki is an internal documentation platform for operations-related documentation at University IT Services at Uppsala University.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864207641&amp;l=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864207641&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864207641&amp;l=sv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864207641&amp;l=sv</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
-ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
-lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
-VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
-MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
-xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
-KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
-HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
-WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
-T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
-TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
-d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
-XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
-oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIE5zCCAs+gAwIBAgIJAPy99YriNVxRMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
+BAMTCndpa2kudXUuc2UwIBcNMjIxMjEzMTUwODA3WhgPMjEyMjExMTkxNTA4MDda
+MBUxEzARBgNVBAMTCndpa2kudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDin/hZDUTkgLdghSZZ2gIxjVOImBOdWgpKL2iKky1Z2cGVEzf8/Ypz
+tEMmM8b5qhSAxGOBl1lr8n1mXVNGP0TUovO7YvnL+8fGBDAAhqlOoEg+mo3z1JGS
+trrZQytX0tmpgH/mUGBWCletr86AphsAaS7M3ZX/OfEVwemFzWrXOQ66lYyy8tOW
+RssWeQ6v5s3Yg1pW1mSsVZNUEb737ZtZNk8QhtLjUOyE1NDcAN8teVJ47mxckhk2
+21sIcSAvDwgAnKTAlBlurDb30O+pKjZ0vGGygvDT/gc6iT1d1FdOJ/zLPz5aJxxY
+SdLwD1eRyHu+6ilMvuQmKfjbXsYrduS32udGmeFDaYv2LIcHBR7O3LBTBNWt1z7E
++WRZJNicvyTgHU1ytnehr/DnCrg3I9foDhrJEhYdpb96VLoDtJ3i9yaxhP3XxERZ
+wbXQU6DIeZzWNpZM1gh0STfzin5me3YjBNJzEbli24qM/3kZuvaJrPRhW1mJ1UOw
+qK85o/fThto+heNG4NQv6y4Og/35cQZ9G9a5f86puFP1/rXGyH+aFnEqdi+7v4Aa
+cZ3v1hcRGkgoSeyATWPz9b34yPmINiO7d0ib17q8yUqhqaCRaRAavXoGCJWndKet
+BEAtHhm1AInVix0FrG51vWTf0+riqg/y6sHklnDHq5Wg+POLS4wUYwIDAQABozgw
+NjAVBgNVHREEDjAMggp3aWtpLnV1LnNlMB0GA1UdDgQWBBQnZRIwN1UrME2OD77+
+1A5weVePPTANBgkqhkiG9w0BAQsFAAOCAgEAYCMxLwK3+GTOo0VGaK1KmLrLU+3X
+GsUYWP67+cFV/lcklERQmFsCEar21xyvHxbRCdsuMz3E7yqj1Wo9GAA0WAinTRsQ
+zBkPvzW0mIRZcmMoOA4+R8X0+Qqzi3bdhdzla5HKPmtj3sCGp7tG3OKAezV75VBm
+IoMzayV6lMcG/L0dX/4KHqfXmR1jjU4rezYFkMuUHxRyvBIesxYWRplhjT8DnBlR
+jO9UpaJWJjpQ/VasBdmEbSiV2IRo8ofx5+Nc414gzIXsZTEZ9XkXMQygKqrkOLK9
+Aoi56u81h2daGI4IK0WMM8HR6K4Hc8ICJZ7kD1o/sDaqxLkD8Nkn4vhFBq9sEr4M
+uyx4cul3sLimqdiP2LRnJMq6WCHAPb3vdZHVMmimX3skXqDKuuCq5m9PVnEQNUqR
+Yk9jSBNeKNT4ptrJSYvoC49R93pS0YBLr/Uv0VGprjwkYAVrMTAB6dY7XgGX+h+f
+P2ESYDUpPGSgFX/MkbPngClmb3p/fLLHfy5x3iLUKud9MMqgotx19cC8t9R68BFm
+Q/lPja2t6j7ql7LZGiZGNN0yRtASl32tZlHlwaDhOnjYwOTtSIjnsqXicnn0EKer
++AqXmoRomlcGOAEzIUhVn4cQ8PcuzYjNb8FAwXv4HcxDoNVDXvgc8scfm5gWYQ/6
+/4GVFFu09/oBhbs=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -59,15 +71,23 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
index 1a7fabba..6da8425f 100644
--- a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
@@ -9,34 +9,46 @@
     <md:Extensions>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wikiu.its.uu.se/Shibboleth.sso/Login"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">IT-avdelningens wiki (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IT Division Wiki (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets IT-avdelnings interna wiki (TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">The internal wiki for the IT Division at Uppsala University (TEST)</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">ITS wiki (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ITS Wiki (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">ITS wiki är en intern dokumentationsplattform för driftsdokumentation vid Avdelningen för universitetsgemensam IT vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">ITS wiki is an internal documentation platform for operations-related documentation at University IT Services at Uppsala University.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864207641&amp;l=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=864207641&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864207641&amp;l=sv</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=864207641&amp;l=sv</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>pugnax.its.uu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=pugnax.its.uu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAIEkN+8ylUzuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHB1Z25heC5pdHMudXUuc2UwHhcNMTIwMzI5MTI0ODI3WhcNMjIwMzI3MTI0
-ODI3WjAbMRkwFwYDVQQDExBwdWduYXguaXRzLnV1LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAp9HVFza7nA9Fh9sC8vy+uMffu02L6lRs5nAW7diP
-lTXyBF9rdZqpWsDmLpjHXxpi0aMtTsN1NPqxMFbRTVKfq6nqCSzSQcO0BLsE9UmT
-VzBgHMoBrhijdTOUNTP6ERotOspin7d5/WB3wnJSDs54lKsB4lyoaScEitBQb8JA
-MhaM24GepDIiP7wQmssJxKyyIEaBoM81L33XD5UCwBiAW8ZwBkYuKmtq/lru3+fL
-xoT/BOhdjbwFNKwHgUB0LDAmwHKsj0FcnJc6apxG+eE0MzOZ5dkoiNpyybwVt1/U
-KrmRgqlci4EhpPFRVD3S6uojs2WGBFpYaGHSgf7m3pLSbwIDAQABoz4wPDAbBgNV
-HREEFDASghBwdWduYXguaXRzLnV1LnNlMB0GA1UdDgQWBBRnYVgSJGy17XqAvfXt
-WkHkNJNL/jANBgkqhkiG9w0BAQUFAAOCAQEAHKyn+Y9WjCo6bVT7XI0OrJj5MbVy
-T7HPRhOOoC+SjvH3TgQBKO06yM/7yDpRQTQHBGbtX6hGmBMSNhs+saMvxcX4Ynte
-TIu8VDBgm4pKnZL3Py5pVRns8ivjjDe7Ae6PjCcknSTgZtVAirCaOtnk8W+vu+HA
-d/g/Y37yeGrhLJiBtyq+NVgVgeGHMSqkTfaV9l4sZdvqTf7jFJTpuMebgzvFn6u1
-XMGVrPxSiWUso4tYO1oJTLWtcYY7WOdDErYMapTQnBr4dAp6xEidPIBKWZtiDt/n
-oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIE5zCCAs+gAwIBAgIJAPy99YriNVxRMA0GCSqGSIb3DQEBCwUAMBUxEzARBgNV
+BAMTCndpa2kudXUuc2UwIBcNMjIxMjEzMTUwODA3WhgPMjEyMjExMTkxNTA4MDda
+MBUxEzARBgNVBAMTCndpa2kudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDin/hZDUTkgLdghSZZ2gIxjVOImBOdWgpKL2iKky1Z2cGVEzf8/Ypz
+tEMmM8b5qhSAxGOBl1lr8n1mXVNGP0TUovO7YvnL+8fGBDAAhqlOoEg+mo3z1JGS
+trrZQytX0tmpgH/mUGBWCletr86AphsAaS7M3ZX/OfEVwemFzWrXOQ66lYyy8tOW
+RssWeQ6v5s3Yg1pW1mSsVZNUEb737ZtZNk8QhtLjUOyE1NDcAN8teVJ47mxckhk2
+21sIcSAvDwgAnKTAlBlurDb30O+pKjZ0vGGygvDT/gc6iT1d1FdOJ/zLPz5aJxxY
+SdLwD1eRyHu+6ilMvuQmKfjbXsYrduS32udGmeFDaYv2LIcHBR7O3LBTBNWt1z7E
++WRZJNicvyTgHU1ytnehr/DnCrg3I9foDhrJEhYdpb96VLoDtJ3i9yaxhP3XxERZ
+wbXQU6DIeZzWNpZM1gh0STfzin5me3YjBNJzEbli24qM/3kZuvaJrPRhW1mJ1UOw
+qK85o/fThto+heNG4NQv6y4Og/35cQZ9G9a5f86puFP1/rXGyH+aFnEqdi+7v4Aa
+cZ3v1hcRGkgoSeyATWPz9b34yPmINiO7d0ib17q8yUqhqaCRaRAavXoGCJWndKet
+BEAtHhm1AInVix0FrG51vWTf0+riqg/y6sHklnDHq5Wg+POLS4wUYwIDAQABozgw
+NjAVBgNVHREEDjAMggp3aWtpLnV1LnNlMB0GA1UdDgQWBBQnZRIwN1UrME2OD77+
+1A5weVePPTANBgkqhkiG9w0BAQsFAAOCAgEAYCMxLwK3+GTOo0VGaK1KmLrLU+3X
+GsUYWP67+cFV/lcklERQmFsCEar21xyvHxbRCdsuMz3E7yqj1Wo9GAA0WAinTRsQ
+zBkPvzW0mIRZcmMoOA4+R8X0+Qqzi3bdhdzla5HKPmtj3sCGp7tG3OKAezV75VBm
+IoMzayV6lMcG/L0dX/4KHqfXmR1jjU4rezYFkMuUHxRyvBIesxYWRplhjT8DnBlR
+jO9UpaJWJjpQ/VasBdmEbSiV2IRo8ofx5+Nc414gzIXsZTEZ9XkXMQygKqrkOLK9
+Aoi56u81h2daGI4IK0WMM8HR6K4Hc8ICJZ7kD1o/sDaqxLkD8Nkn4vhFBq9sEr4M
+uyx4cul3sLimqdiP2LRnJMq6WCHAPb3vdZHVMmimX3skXqDKuuCq5m9PVnEQNUqR
+Yk9jSBNeKNT4ptrJSYvoC49R93pS0YBLr/Uv0VGprjwkYAVrMTAB6dY7XgGX+h+f
+P2ESYDUpPGSgFX/MkbPngClmb3p/fLLHfy5x3iLUKud9MMqgotx19cC8t9R68BFm
+Q/lPja2t6j7ql7LZGiZGNN0yRtASl32tZlHlwaDhOnjYwOTtSIjnsqXicnn0EKer
++AqXmoRomlcGOAEzIUhVn4cQ8PcuzYjNb8FAwXv4HcxDoNVDXvgc8scfm5gWYQ/6
+/4GVFFu09/oBhbs=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -59,15 +71,23 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+    <md:GivenName>IT Support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>