SWAMID-693,694,695 and 698 Updated 3 SP:s + added "new" https://uu-se.zoom.us

6 files changed, 192 insertions, 69 deletions

diff --git a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
index 70ba7b41..bbaa7cdf 100644
--- a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
@@ -92,4 +92,9 @@
     <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714750</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/stipendier-utv.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml
index 5344d4cb..373a0d0e 100644
--- a/swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml
@@ -92,4 +92,9 @@
     <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714750</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/stipendier.uu.se-stipendium.xml b/swamid-2.0/stipendier.uu.se-stipendium.xml
index e6d23904..893d3d9f 100644
--- a/swamid-2.0/stipendier.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier.uu.se-stipendium.xml
@@ -61,8 +61,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stipendier.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="2"/>
-    <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
-    <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
+    <md:AssertionConsumerService xmlns:ns1="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" ns1:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
+    <md:AssertionConsumerService xmlns:ns1="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" ns1:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
     <md:AttributeConsumingService index="0" isDefault="true">
       <md:ServiceName xml:lang="sv">Stipendiehantering</md:ServiceName>
       <md:ServiceName xml:lang="en">Scholarship</md:ServiceName>
@@ -98,4 +98,9 @@
     <md:EmailAddress>mailto:stipendiekansliet@uadm.uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4714750</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/uu-se.zoom.us-old.xml b/swamid-2.0/uu-se.zoom.us-old.xml
new file mode 100644
index 00000000..8f747d53
--- /dev/null
+++ b/swamid-2.0/uu-se.zoom.us-old.xml
@@ -0,0 +1,139 @@
+<?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="uu-se.zoom.us">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-04-09T07:14:10Z">
+      <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://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>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Zoom e-mötestjänst för Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Zoom E-Meeting Service for Uppsala University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Uppsala universitets e-mötestjänst.</mdui:Description>
+        <mdui:Description xml:lang="en">This is Uppsala University's e-meeting service.</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="50" width="220">https://d24cgw3uvb9a9h.cloudfront.net/static/93461/image/new/ZoomLogo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="220">https://d24cgw3uvb9a9h.cloudfront.net/static/93461/image/new/ZoomLogo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=267521030&amp;l=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=267521030&amp;l=sv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=267521030&amp;l=sv</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=267521030&amp;l=en</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <!-- NOTE: New Zoom Certificate 2022-2023 -->
+    <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>
+    <!-- NOTE: Expires 2022-02-02 23:59:59 -->
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIGXTCCBUWgAwIBAgIQCLgQc9Z8Mn06Q0tiGbaLyjANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIg
+VExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjEwMTMwMDAwMDAwWhcNMjIwMjAyMjM1OTU5WjBz
+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU2FuIEpvc2UxKDAm
+BgNVBAoTH1pvb20gVmlkZW8gQ29tbXVuaWNhdGlvbnMsIEluYy4xEjAQBgNVBAMMCSouem9vbS51
+czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr7fhmYCA4vbIaKgslTW4Z4kclIUlT
+lUYNJlg9GltCxniWIsYgfg3EijrsJrg9T0fxCsyDyFsK+Cp8xMTQ4On5r1hywuVKdynkwsquAGa1
+uRq5ZVpqsNnM3gGj2bGrWHzoiTYI6D/3Nf7qmGhVVMIdoOOq/LdBkXW4oVscuQ0qtKRMBgwuIvaA
+jhOPNmR0zVaRTyKFBiSJ0gsNs8TnNNK6jV3H4NzBch62SZCp044SRm+PraBCPe9p06osKpvxTcVy
+Lk+5CO9rAQ8rIDsWkxHgnANwHAjcsZUq4bJQoDbR1PDWeWx9ukg/2xB6u9hVJH8sHYN6HBG1u+iJ
+bzk7iI0CAwEAAaOCAwUwggMBMB8GA1UdIwQYMBaAFHSFgMBmx9833s+9KTeqAx2+7c0XMB0GA1Ud
+DgQWBBTAREAaUszyCMnuwZbt9cFf7TL6BzAUBgNVHREEDTALggkqLnpvb20udXMwDgYDVR0PAQH/
+BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmwYDVR0fBIGTMIGQMEagRKBC
+hkBodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxHMlRMU1JTQVNIQTI1NjIw
+MjBDQTEuY3JsMEagRKBChkBodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxH
+MlRMU1JTQVNIQTI1NjIwMjBDQTEuY3JsMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUH
+AgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzCBhQYIKwYBBQUHAQEEeTB3MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jYWNlcnRz
+LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS5jcnQwDAYD
+VR0TAQH/BAIwADCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ACl5vvCeOTkh8FZzn2Old+W+V32c
+YAr4+U1dJlwlXceEAAABd1DklkMAAAQDAEcwRQIgf7v/1oAu8TaMZY1oC54IIjCafBk7ULVxbB6z
+njcNm1QCIQDxkgErH9NtXP7y0A4RbARNsDsFy9Hv55p24eCNUK/FrwB2ACJFRQdZVSRWlj+hL/H3
+bYbgIyZjrcBLf13Gg1xu4g8CAAABd1DkloQAAAQDAEcwRQIhAPnOx4XQU42yVZCYx5+WAVIJtAHk
+giafYHb1ckbSu7cqAiBBioJE6Heu1m/ghij8nJ7rfhp7vs1f306wQmR9+oM3tzANBgkqhkiG9w0B
+AQsFAAOCAQEAGd7m50xG+YjmfiFiAwcC3A9WDYCv6gwnb8rZgrZFUW50fV1tN8YnUW2ItUe0rPgM
+ZkyizgY0S78qMhBAJTESKrk5AODtCbZ78pZFRat9FeM2MjUBmgSZuxEdoFXxhvwCcOhJG+JNjeba
+6o/tPeCKeKE1SbtoOd53m6mlNampDjO4Ew0J94QkCA0GR6verVVJJsyDMZW4tcXaPAWU9F3cuBhb
+3H8TzSiVX+JruLLaUdWCtTqKDYyVJBxNNKV/cVzLqcXaLIUq3LwqrSLfh1axuYW64VT1SHe2MAsM
+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://uu-se.zoom.us/saml/SingleLogout" ResponseLocation="https://uu-se.zoom.us/saml/SingleLogout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SingleLogout" ResponseLocation="https://uu-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://uu-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SSO" index="1"/>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Uppsala universitet</Company>
+    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184714400</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uu-se.zoom.us.xml b/swamid-2.0/uu-se.zoom.us.xml
index 8f747d53..03d4a16d 100644
--- a/swamid-2.0/uu-se.zoom.us.xml
+++ b/swamid-2.0/uu-se.zoom.us.xml
@@ -1,14 +1,12 @@
 <?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="uu-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://uu-se.zoom.us">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-04-09T07:14:10Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-02-11T15:55:48Z">
       <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://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>
@@ -27,8 +25,8 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=267521030&amp;l=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <!-- NOTE: New Zoom Certificate 2022-2023 -->
-    <md:KeyDescriptor use="signing">
+    <!-- NOTE: New Zoom certificate 2022-2023 -->
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -67,44 +65,6 @@ mYIp+qov+EzUDeCQ
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <!-- NOTE: Expires 2022-02-02 23:59:59 -->
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGXTCCBUWgAwIBAgIQCLgQc9Z8Mn06Q0tiGbaLyjANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypEaWdpQ2VydCBHbG9iYWwgRzIg
-VExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjEwMTMwMDAwMDAwWhcNMjIwMjAyMjM1OTU5WjBz
-MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU2FuIEpvc2UxKDAm
-BgNVBAoTH1pvb20gVmlkZW8gQ29tbXVuaWNhdGlvbnMsIEluYy4xEjAQBgNVBAMMCSouem9vbS51
-czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCr7fhmYCA4vbIaKgslTW4Z4kclIUlT
-lUYNJlg9GltCxniWIsYgfg3EijrsJrg9T0fxCsyDyFsK+Cp8xMTQ4On5r1hywuVKdynkwsquAGa1
-uRq5ZVpqsNnM3gGj2bGrWHzoiTYI6D/3Nf7qmGhVVMIdoOOq/LdBkXW4oVscuQ0qtKRMBgwuIvaA
-jhOPNmR0zVaRTyKFBiSJ0gsNs8TnNNK6jV3H4NzBch62SZCp044SRm+PraBCPe9p06osKpvxTcVy
-Lk+5CO9rAQ8rIDsWkxHgnANwHAjcsZUq4bJQoDbR1PDWeWx9ukg/2xB6u9hVJH8sHYN6HBG1u+iJ
-bzk7iI0CAwEAAaOCAwUwggMBMB8GA1UdIwQYMBaAFHSFgMBmx9833s+9KTeqAx2+7c0XMB0GA1Ud
-DgQWBBTAREAaUszyCMnuwZbt9cFf7TL6BzAUBgNVHREEDTALggkqLnpvb20udXMwDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjCBmwYDVR0fBIGTMIGQMEagRKBC
-hkBodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxHMlRMU1JTQVNIQTI1NjIw
-MjBDQTEuY3JsMEagRKBChkBodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9iYWxH
-MlRMU1JTQVNIQTI1NjIwMjBDQTEuY3JsMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUH
-AgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzCBhQYIKwYBBQUHAQEEeTB3MCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jYWNlcnRz
-LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNBU0hBMjU2MjAyMENBMS5jcnQwDAYD
-VR0TAQH/BAIwADCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ACl5vvCeOTkh8FZzn2Old+W+V32c
-YAr4+U1dJlwlXceEAAABd1DklkMAAAQDAEcwRQIgf7v/1oAu8TaMZY1oC54IIjCafBk7ULVxbB6z
-njcNm1QCIQDxkgErH9NtXP7y0A4RbARNsDsFy9Hv55p24eCNUK/FrwB2ACJFRQdZVSRWlj+hL/H3
-bYbgIyZjrcBLf13Gg1xu4g8CAAABd1DkloQAAAQDAEcwRQIhAPnOx4XQU42yVZCYx5+WAVIJtAHk
-giafYHb1ckbSu7cqAiBBioJE6Heu1m/ghij8nJ7rfhp7vs1f306wQmR9+oM3tzANBgkqhkiG9w0B
-AQsFAAOCAQEAGd7m50xG+YjmfiFiAwcC3A9WDYCv6gwnb8rZgrZFUW50fV1tN8YnUW2ItUe0rPgM
-ZkyizgY0S78qMhBAJTESKrk5AODtCbZ78pZFRat9FeM2MjUBmgSZuxEdoFXxhvwCcOhJG+JNjeba
-6o/tPeCKeKE1SbtoOd53m6mlNampDjO4Ew0J94QkCA0GR6verVVJJsyDMZW4tcXaPAWU9F3cuBhb
-3H8TzSiVX+JruLLaUdWCtTqKDYyVJBxNNKV/cVzLqcXaLIUq3LwqrSLfh1axuYW64VT1SHe2MAsM
-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://uu-se.zoom.us/saml/SingleLogout" ResponseLocation="https://uu-se.zoom.us/saml/SingleLogout"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SingleLogout" ResponseLocation="https://uu-se.zoom.us/saml/SingleLogout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
@@ -112,28 +72,36 @@ U7U1sUyCVwFp2Z7D3xnz+erklZPsBxecF7mTebgi9XUUUJDiEA==
     <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://uu-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SSO" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SSO" index="1" isDefault="true"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
-    <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <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 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: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-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 589cbbef..8cd91254 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -478,6 +478,7 @@
   <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/uu-se.zoom.us.xml"/>
+  <xi:include href="swamid-2.0/uu-se.zoom.us-old.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"/>
   <xi:include href="swamid-2.0/account.tst.ki.se-shibboleth.xml"/>