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

17 files changed, 168 insertions, 100 deletions

diff --git a/swamid-2.0/his-se.zoom.us.xml b/swamid-2.0/his-se.zoom.us.xml
index ed37dc2d..d0336677 100644
--- a/swamid-2.0/his-se.zoom.us.xml
+++ b/swamid-2.0/his-se.zoom.us.xml
@@ -26,6 +26,43 @@
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
+          <ds:X509Certificate>MIIGtDCCBZygAwIBAgIQD6Z17ItDWQu0yyxAtAnrYjANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
+QTI1NiAyMDIwIENBMTAeFw0yMjEyMDIwMDAwMDBaFw0yNDAxMDIyMzU5NTlaMHExCzAJBgNVBAYT
+AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTYW4gSm9zZTEoMCYGA1UEChMfWm9v
+bSBWaWRlbyBDb21tdW5pY2F0aW9ucywgSW5jLjEQMA4GA1UEAxMHem9vbS51czCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOqNDpitwYkdu8PGmQqtP6bDRqLZtCGbq0wud/CylugrpFwQ
+7HVZ7hI8Z/nzbHyLwDzLhpTGqEnm5qVUi26xrV5aqWXqiWFAOwYKk3jP3mcTpG9WMq7bEJvihPom
+j/E7B9U9tnNwduQDt8OVFRueg1u4I2LESLPDRg7qVCW6VAh4v0LqbGyc7jJauSEY2xxaojVIpnnn
+BMkPGF7mMDcnCLQJGYmI+vboTO7KNwcZAPn28bVzWGwbm6vM9FDTppo5o4WTCh43H1QCLolgzKgT
+yyeS26YgOwbayhu4//O7wqtDXeuKtj2cEmc3ilnzLDuFngTir3CysIi0mt3myc5HCsUCAwEAAaOC
+A2gwggNkMB8GA1UdIwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBSot7vIVLfu
+Cazk/mNhXlHX3ytc2DASBgNVHREECzAJggd6b29tLnVzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NybDMu
+ZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDBAoD6gPIY6aHR0
+cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTUlNBU0hBMjU2MjAyMENBMS00LmNybDA+
+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0LmNv
+bS9DUFMwfwYIKwYBBQUHAQEEczBxMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j
+b20wSQYIKwYBBQUHMAKGPWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU1JT
+QVNIQTI1NjIwMjBDQTEtMS5jcnQwCQYDVR0TBAIwADCCAX8GCisGAQQB1nkCBAIEggFvBIIBawFp
+AHcA7s3QZNXbGs7FXLedtM0TojKHRny87N7DUUhZRnEftZsAAAGE0/N6ewAABAMASDBGAiEA5Mhc
+0d6sZNtrdq0jWqc/imfzMOAocgwHq76uJDHjtHcCIQDgbXON84Ja2IONn40Yh5i6LOykzKFz6HzV
+w8W+qVPy9QB2AHPZnokbTJZ4oCB9R53mssYc0FFecRkqjGuAEHrBd3K1AAABhNPzepcAAAQDAEcw
+RQIgHLSlxaolYqtfe9liu20jdPrzJXCmP9V+EUmbxGlgzI0CIQCvjMbXP7A0mqrfGZzr1oJ3vC3g
+GAL7k5ImajdpGMNQYAB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0sgdm7v6s52IRzAAABhNPzemcA
+AAQDAEcwRQIhAIFRTXn51qcftMSUm2Uo3R9eM35rjlAJrypveHMJZt56AiB0THd05FhaBQNYEQa/
+iUMHKnX1I+UA54ykfEuG8igK0jANBgkqhkiG9w0BAQsFAAOCAQEAZ+5lPt/WfY2RS+FPOglEwhng
+X4LAY7QWBmNVO37h5qxuMQ2uPndOrpjg6gSyuoJ1YtPvbFGY4LyGCuLsJLt7ktcnjWp4QGwGWi2c
+tMfRirliXN2K1MSK5ffdYm00Gusd9o9qX0r2igDHk1NghTQgIg6UksMeGnv07eyueKB54TddfvKc
+7p2QIO6cysugdfKY3WIltLPAPitpSwbLYaiv5isD2qEdWgxAP+iPCGvKgZmHNNRuBPMafWOrkkE1
+xFEIAakZ2fyywt4v69l48K9/2kWs8PBshSPhTExTT1Da3oEr/EkAoiPWnOrUZlqWd2otiND6r7+q
+1DRWBQAfrRyEtg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
           <ds:X509Certificate>MIIGtjCCBZ6gAwIBAgIQCf48SVwTzO89aW3TTSBUPTANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
 EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBEaWdpQ2VydCBUTFMgUlNBIFNI
 QTI1NiAyMDIwIENBMTAeFw0yMjAxMDUwMDAwMDBaFw0yMzAxMDQyMzU5NTlaMHExCzAJBgNVBAYT
diff --git a/swamid-2.0/hrm.flexhosting.se-HRM-.xml b/swamid-2.0/hrm.flexhosting.se-HRM-.xml
new file mode 100644
index 00000000..004389ca
--- /dev/null
+++ b/swamid-2.0/hrm.flexhosting.se-HRM-.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://hrm.flexhosting.se/HRM/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-03T09:29:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets Flex HRM</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University Flex HRM</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets Flex HRM</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University Flex HRM</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://www.flexapplications.se/wp-content/themes/flex-theme/assets/img/logo-small-black.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://www.flexapplications.se/wp-content/themes/flex-theme/assets/img/logo-small-black.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://hrm.flexhosting.se/HRM/Public/CookiePolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://hrm.flexhosting.se/HRM/Public/CookiePolicy/EN</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://hrm.flexhosting.se/uppsalainfo.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://hrm.flexhosting.se/uppsalainfo.html</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHTCCAwWgAwIBAgIUNqw/vSBvQsrXNohG8fW6+bXOO9YwDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAwwSaHJtLmZsZXhob3N0aW5nLnNlMCAXDTIzMDExNjE1MTEx
+OFoYDzIxMDUwMzA3MTUxMTE4WjAdMRswGQYDVQQDDBJocm0uZmxleGhvc3Rpbmcu
+c2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDUsxEAJ6g1Sm2nlhbc
+h34s2xqmzIzT10nEglJwLTlhQHEICNnwzBdoRl5XRrSNPSedVe0K1vW+BCWe1xqX
+flyImSHY16PPRaHESJAUleIbSLJCBC32QCXF3sP1D3TT4dgixcUqXyKu2ShB+oMl
+uq2wRlEIit6tk9xkdpwyhp2TUtgzYv38XGCm47UASWpgGnYE/6Rdjm9mxo+vqK9+
+8tXTfSULAKrKJGbjXnPXWbn55H73+WeJVklptEUfeuqojoF5MYBvybKyVyZ4FMy9
+hwP2gMRovXuybi/oT8Glg9PmrWWKIuPID19+9J3mqTZVk/fuUapHmgXbFaTBUCX1
+xGG27+vVKkRw2n+PntkUfMpHXJlJY7DlKW3f/C5j8YlEwv/bQ4C35gyjHT7IDJr2
+LZ1ydBhcPwN/J7ZwzRCSYQSiuR61Rz85VFRR5wen3gshcjpMM3iyVzmkPsdxp/sx
+fDHtvF2/BJe+O6d4D6cbt6aWg+kMBdROzdHakzXFeXcXjPi6/KqTL/ldKcQywQeN
+6QoFdwmkADrDCSdozZbYV0CGTb6oaE9+6V8/WtbcS6XoohHO4xP2/n1eaNDwdffH
+LxUcxho8tbBW81GhriZnBnRKJYWxYmJJZxLsZtH2VHAp2anFYPcSwp4zYMbZ6Jrc
+auUxKYXTesf7T14KgGK4f5mcBQIDAQABo1MwUTAdBgNVHQ4EFgQULmVTmJEurFJO
+/ozzuyKqmv9dto8wHwYDVR0jBBgwFoAULmVTmJEurFJO/ozzuyKqmv9dto8wDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAhyihoUhjY7RcfpRML+QZ
+bZRiVAhbavEZN51qLu8XWkynyBf8PtFpYtrAhRFTrA9tD6Lx/sw+FaUw6odlZgFW
+JF/Nczusvh7N/8WChhgx8FXdkJcOx3b943xIE+xwzmjYR+MkG/xSUwPfSn0Juzsn
+zLSDHzG5RGcn9IqeQOBzA+0KfY066KMsqy+6IU3NjrIeHswZ/7DIuToU1DIjIwvq
+wMp1vSpAn3fIwlX2EC1aZTNCq3XVIo7YUedmu4QCnNdSaLDoBikLlEXQVQuqBpX8
+r9vC3CgCcH9IYo0mof1jGx3QgV2wgBI0jBYs4GB6Xxd6WDpU4ev+SLp9tfTqblWd
+LVWQ9z4jpzvEMcmV/zFq6ps77NqwGimnKpPSmmXJgdGQ6LDNjpozPACR0pWaUqtW
+HN6LU4aN1mt2oHzR/MZu0HmEqGaIQ/yGkR/UcTCjDNkBjYb4AJ4UezbT0JRkll9i
+ioqff7yagskggg3g9wBH75hqfrMtdL/B9hE/d878/F6At8jme/2h8lzBI51BCTJd
+44fAWpGSwnfV4m/iRnVOVIDhTA+70HTqyoYgo70S6F3yERcNEIs0vufVvOc1q8R2
+HUJTSOYUMBcgDlBVO13UcJMM+8h3p9DK0Z1YQ8Win8ZStqp4M756QnsjXDvyyCzg
+3b+CsJQKl1co3pCc06a48bE=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hrm.flexhosting.se/HRM/Saml2/Logout"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="true" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hrm.flexhosting.se/HRM/Saml2/Acs" isDefault="false" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Flex Applications Sverige AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Flex Applications Sverige AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Flex Applications</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Flex Applications</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.flexapplications.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.flexapplications.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Flex Applications</md:Company>
+    <md:EmailAddress>mailto:tekniskkonsulting@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Flex Applications</md:Company>
+    <md:SurName>HRM Time Support</md:SurName>
+    <md:EmailAddress>mailto:time.support@flexapplications.se</md:EmailAddress>
+    <md:TelephoneNumber>+4619103915</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Flex Applications</md:Company>
+    <md:SurName>Info</md:SurName>
+    <md:EmailAddress>mailto:info@flexapplications.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/lists-test.its.uu.se-shibboleth.xml b/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
index a9ea4301..4e7d28bc 100644
--- a/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
@@ -28,8 +28,7 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIJAPjoEGy5brVxMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAPjoEGy5brVxMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
 BAMTGHV1Yy1lcG9zdDAwMS10Lml0cy51dS5zZTAeFw0xNjA3MDgxMTExNTBaFw0y
 NjA3MDYxMTExNTBaMCMxITAfBgNVBAMTGHV1Yy1lcG9zdDAwMS10Lml0cy51dS5z
 ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALpbYyhAQmOp4+4/kS6i
@@ -45,8 +44,7 @@ Fw8o5RCDtH1TmLDco13BDHIgZsZwh8/pWGIjQmAg11wYHeDnJv2A+D/5w1QHhDjt
 i6PPfIJQLKdz+T9Zfpf6wbSYtzjx0P3qZE/VVR6QG6cOJiR9+MFZ73d1OzIr+FlX
 g6cJYjTSu9Ju2IPFl5+eQ/E4pwFkVxINy47xpnLzHB8EiwiVJB7Q/hjg0N2bZhrQ
 uMCJmdTCzi2cjhnAd+Dxs/iugXnTzRS0sNs1Zk7qDS2bIVApBsMnX08yd2/C/iW/
-wzb6WuA6SpmDZEUhZiP8E/PnBg==
-</ds:X509Certificate>
+wzb6WuA6SpmDZEUhZiP8E/PnBg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -63,8 +61,8 @@ wzb6WuA6SpmDZEUhZiP8E/PnBg==
     <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:OrganizationURL xml:lang="sv">https://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Uppsala universitet</md:Company>
diff --git a/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml b/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
index 84651aa6..36fd71a8 100644
--- a/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
+++ b/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
@@ -48,8 +48,8 @@
     <md:EmailAddress>mailto:registrator@uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>E-coordinator IT</md:GivenName>
-    <md:EmailAddress>mailto:luisa.angarita@uu.se</md:EmailAddress>
+    <md:GivenName>IT-support</md:GivenName>
+    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Registratorsfunktionen Uppsala universitet</md:GivenName>
diff --git a/swamid-2.0/uraccess.net-shibboleth.xml b/swamid-2.0/uraccess.net-shibboleth.xml
index 6f9210bc..b280e06a 100644
--- a/swamid-2.0/uraccess.net-shibboleth.xml
+++ b/swamid-2.0/uraccess.net-shibboleth.xml
@@ -95,10 +95,6 @@ RXmDTYIhHnjv+Sc7dzCbIA==</ds:X509Certificate>
       <md:ServiceName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</md:ServiceName>
       <md:ServiceName xml:lang="en">Medialibrary for Swedish Universitys</md:ServiceName>
       <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-    <md:AttributeConsumingService index="2">
-      <md:ServiceName xml:lang="en">UR access - Medialibrary for Swedish Universitys</md:ServiceName>
-      <md:ServiceName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</md:ServiceName>
       <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:AttributeConsumingService>
   </md:SPSSODescriptor>
diff --git a/swamid-2.0/uu-se.zoom.us.xml b/swamid-2.0/uu-se.zoom.us.xml
index f0257b74..f944a168 100644
--- a/swamid-2.0/uu-se.zoom.us.xml
+++ b/swamid-2.0/uu-se.zoom.us.xml
@@ -62,43 +62,6 @@ xFEIAakZ2fyywt4v69l48K9/2kWs8PBshSPhTExTT1Da3oEr/EkAoiPWnOrUZlqWd2otiND6r7+q
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <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: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>
diff --git a/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml
index 7ec61720..a08e1f01 100644
--- a/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml
@@ -41,8 +41,8 @@
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu-test.su.se/Shibboleth.sso/WAYF/skolfederation-prod-ds"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-test.su.se/Shibboleth.sso/WAYF/skolfederation-prod-ds" index="4"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Verksamhetsförlagd utbildning Stockholms universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Workplace Situated Education at Stockholm University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">VFU Stockholm</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">VFU Stockholm</mdui:DisplayName>
         <mdui:Description xml:lang="sv">VFU är verksamhetsfölagd utbildning där utbildningen sker på en arbetsplats</mdui:Description>
         <mdui:Description xml:lang="en">VFU is workplace situated education where the education takes place at a work place</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="sv">https://serviceportalen.su.se/sv-se/article/1366077</mdui:PrivacyStatementURL>
@@ -77,8 +77,7 @@ z2kjZDnC9koTfdCfXcJYYb80Q2HTUgOCzHB8P59PsE4xICJnv/46DjSFEC0K0FK9
 INPUZSNJyTrAcYOWdVUfJlQVdg68xrQ3cLUwRDMcXZVB3Fw2QCZ/GOnEdcAL1EBr
 mTS0UIdUu7d97uXfcXh3cpJE0yKJkp7wqSPQc0KjiVX8/CQktDp+lEoK6mXq2nH5
 omqHqOUiXNzNk2QMEJKGPmOnJnqEKrfsVVOF1W1drPFE79z/u4GmEloIcZrkhfW8
-+z3vnyleKKoEJ9snUv7dus+mZXqmrdFPZ2KS8lbkw68=
-</ds:X509Certificate>
++z3vnyleKKoEJ9snUv7dus+mZXqmrdFPZ2KS8lbkw68=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
diff --git a/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml b/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
index 647ce79c..c9c63da0 100644
--- a/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
@@ -37,8 +37,8 @@
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfusyd-test.su.se/Shibboleth.sso/SWAMID" index="3"/>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfusyd-test.su.se/Shibboleth.sso/WAYF/eduid.se"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Verksamhetsförlagd utbildning Stockholms universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Workplace Situated Education at Stockholm University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">VFU Syd</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">VFU Syd</mdui:DisplayName>
         <mdui:Description xml:lang="sv">VFU är verksamhetsförlagd utbildning där utbildningen sker på en arbetsplats</mdui:Description>
         <mdui:Description xml:lang="en">VFU is workplace situated education where the education takes place at a work place</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://serviceportalen.su.se/sv-se/article/1366077</mdui:PrivacyStatementURL>
@@ -73,8 +73,7 @@ Qf+Y1V1pC9RrourzDjnvJSxA/u6BSeO5i/n6Go/lCUtr4gdLuomuJ0jsq9m9Hw/Y
 56P/XBP58u235LYqzbBE2vCfB0sBQlG+lOeHsClWRZNzVWG3MPsSlyf+fh4I6D2B
 lWpKHoXq66x72bEhci/cH2w91lsJbdvAW/CKToKW1aJqqu4bE92T9oT+Il2VxYdQ
 zK9I/ZT//YaNx36PmkZ9mi7nlNPudfLa7vIRwKBM+p3W9erzMfTJwFUCzk/f5JhZ
-b6XhptNS5kSIVoJCgXaUP1Vi/pyzm713Re9wwYT92JDWUgfHPsVXUnQ=
-</ds:X509Certificate>
+b6XhptNS5kSIVoJCgXaUP1Vi/pyzm713Re9wwYT92JDWUgfHPsVXUnQ=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
diff --git a/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml b/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
index 902ec86c..a8a1a3f3 100644
--- a/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
+++ b/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
@@ -9,8 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
diff --git a/swamid-edugain/login.idp.eduid.se-idp.xml.xml b/swamid-edugain/login.idp.eduid.se-idp.xml.xml
index 99221419..5bf60ca7 100644
--- a/swamid-edugain/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-edugain/login.idp.eduid.se-idp.xml.xml
@@ -9,17 +9,12 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
         <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:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -42,7 +37,7 @@
         <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
@@ -70,25 +65,34 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX</ds:X509Certificate>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
-RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
-MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
-EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
-AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
-eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
-G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
-dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
-F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
-JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
-fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
-Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
-5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
-ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
-cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
-q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
-eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
-FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
-iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX</ds:X509Certificate>
+          <ds:X509Certificate>MIIFOzCCAyOgAwIBAgIUWPwkNYJTtm4tfV5sDpn5ftnQ+UkwDQYJKoZIhvcNAQEL
+BQAwLTELMAkGA1UEBhMCU0UxHjAcBgNVBAMMFTIwMjMwMTE2LmlkcC5lZHVpZC5z
+ZTAeFw0yMzAxMTYxNTI3NDNaFw0zMzAxMTMxNTI3NDNaMC0xCzAJBgNVBAYTAlNF
+MR4wHAYDVQQDDBUyMDIzMDExNi5pZHAuZWR1aWQuc2UwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCnoqAT/8cAhJHcOhlGrMky7REiMS06ulLbo7AgRJ9N
+6o7n162pqva+s0CkV1su8TEyyi11VWdUruIApHTM37zt4HEqvRJcf+SvhhfecI58
+QWobWQAnl5c2BbYxkp1m9bvLGR+H93/DumeECmcA78dHx+igQRa+t/wixXOoj2yY
+tFDUKvguHYXesJxpdZYhj7hgH5pG1Zlx8pa3ADcVAp7A1yFiio1cAJemgXY8BjaO
+1UOHlzBfEXZaKIu0m0vhFSQg0tCsgt1/os6RbEEXAIoJuEc4lOz2k4O3WB74lljH
+UGvjgATfRA3hl//suQr7sIwQGnnerc9Is64Qt14e+QWqnp1/8Rd/S6f2ODLkSdaG
+WBN3LZO/97YtywYGQXxROnFmHfzOPd3i5DHCB+00PslFRexYkdLRk4P+W1ufnkNa
+JGmjyRnyRIrFLWfnyc22W4T4PKACoBLVX3+hAHUBeFRXyKp0+0yKOhphSIdjqtOj
+2mOhMwmPC26naizV61Q+t7/8Lj4sfZRp4NNNcWJWo+2oxxx0wuaRK0i/TGVI11Ot
+220yJpMa+Tp6pTchPKBGKfiIcmh40I73IdEKdoYTP071pg1C70JE7R/1GPLXUfbE
+vYtuOmm1mfpWKo09Uq6BSTX0+En/tn0aJjmWbu63fif1Qr3M9czKVyCRtrccRbqv
+6wIDAQABo1MwUTAdBgNVHQ4EFgQUeuKNxUdIdpLeygKLXmTAdXeSMAswHwYDVR0j
+BBgwFoAUeuKNxUdIdpLeygKLXmTAdXeSMAswDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAgEAS1WSpDfd2+9DzZZAbcU17QOQIdz0mYvpqSJjjYRZZYPf
+nKY7j9hmZeIOsq4uPhTlUs7/hlALXqCt5nNJ9Af1oVgeeslSRGiaPtfELXsN4qav
+Mr7XcUqR+ybwhr1lSWbhykdyhFTrtKEYbe73nbDWJqSbRR8efhqzLtqpqjIVr84q
+Pu0mnzWsu/kbH3T6zP3dp3OedNv7XBeoZVnD9DrOCPZaQoSAP/012KtpZUiM5k6B
+sHK9ZtREiBmMLpQMUVluwXNUXfUh/2T2vWTUAEL0Pym48VKYi+WtjtIqKFu41COE
+CNsUTeu+Ff/WPVfyLNgHJOnzlCrkfcVsiFr7rX0jPnXA+JGrM+lS0DTu5YwMjegY
+xDhMPikaZbhygNPQnYhLbKkq8QRxa4T8CyQiNm0DOjmHNiUNijFIzrw9yFsjqoZV
+MWe8oDG5JTAJmnnlQ4lUuWe2rOZ7HOeK1v5KRxsDOeswjsVQQC0JwvgE+3UqAvc2
+iYQBJlLYaAOLzvJu3B39rf0YqfQskV9mZsmRC9jZJo0e1Z45ND/elfDi42/162dY
+bOWj6fPl9bldSE3e7SAqnU4vlRVGXJM+CEQB7L3Tsc6JONrskQLyXuyQf2yr9HAx
+RVtD2xG8+6W5O+PpWCZOnshCVVSv4c3UmUSJt1nEEr4FJUdugvnAojwsxCjBabA=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -109,13 +113,13 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX</ds:X509Certificate>
     <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fresia</md:GivenName>
-    <md:SurName>Pérez</md:SurName>
-    <md:EmailAddress>mailto:fresia@sunet.se</md:EmailAddress>
+    <md:GivenName>Zacharias</md:GivenName>
+    <md:SurName>Törnblom</md:SurName>
+    <md:EmailAddress>mailto:zacharias@sunet.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>SUNET eduID team</md:GivenName>
-    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
+    <md:EmailAddress>mailto:feedback@eduid.se</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>eduID Support</md:GivenName>
diff --git a/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml b/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
index a34145ea..80fff703 100644
--- a/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
+++ b/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
@@ -9,8 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d77f4fe4..318e6ddb 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -127,6 +127,7 @@
   <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hkrplay.hkr.se.xml"/>
   <xi:include href="swamid-2.0/hr.su.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/hrm.flexhosting.se-HRM-.xml"/>
   <xi:include href="swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/hvplay.hv.se.xml"/>
   <xi:include href="swamid-2.0/id-test.du.se-saml2.xml"/>
diff --git a/swamid-testing/idp.dev.eduid.se-idp.xml.xml b/swamid-testing/idp.dev.eduid.se-idp.xml.xml
index 98cf700c..fe7b183b 100644
--- a/swamid-testing/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-testing/idp.dev.eduid.se-idp.xml.xml
@@ -9,8 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
diff --git a/swamid-testing/idpproxy.dev.eduid.se-idp.xml b/swamid-testing/idpproxy.dev.eduid.se-idp.xml
index a12fb40d..01804226 100644
--- a/swamid-testing/idpproxy.dev.eduid.se-idp.xml
+++ b/swamid-testing/idpproxy.dev.eduid.se-idp.xml
@@ -12,8 +12,6 @@
       <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
diff --git a/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml b/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
index 0b5b4e62..7cb64c83 100644
--- a/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
+++ b/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
@@ -9,8 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
diff --git a/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml b/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml
index 34a5da69..17d21035 100644
--- a/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml
+++ b/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml
@@ -9,8 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
diff --git a/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
index 3947cda0..7a0e9d73 100644
--- a/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
+++ b/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
@@ -9,8 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">