SWAMID-477, SWAMID-478 replacement of 2 SP:s

5 files changed, 153 insertions, 98 deletions

diff --git a/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml b/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml
new file mode 100644
index 00000000..75c5da9d
--- /dev/null
+++ b/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.gotastudentkar.se/auth/saml/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-15T13:17:20Z">
+      <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" 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>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Medlemsportal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Medlemsportalen för Göta studentkår</mdui:Description>
+        <mdui:Description xml:lang="en">Member Portal for Göta studentkår</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.montania.se/produkter/agera-medlemsregister/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.montania.se/produkter/agera-medlem-en/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.montania.se/medlemsportalen-privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.montania.se/member-portal-privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" width="240" height="52">https://medlem.gotastudentkar.se/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="240" height="52">https://medlem.gotastudentkar.se/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFsjCCA5oCCQDpEbU4mm3pjTANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEhMB8GA1UEAwwYbWVkbGVtLmdvdGFzdHVkZW50a2FyLnNlMSEwHwYJKoZIhvcNAQkBFhJtZWRsZW1AbW9udGFuaWEuc2UwHhcNMjExMTE1MTEyMDMzWhcNMzExMTE1MTEyMDMzWjCBmjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEhMB8GA1UEAwwYbWVkbGVtLmdvdGFzdHVkZW50a2FyLnNlMSEwHwYJKoZIhvcNAQkBFhJtZWRsZW1AbW9udGFuaWEuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE1yrY9anraPWrrKw707+sylhZ1v6QU/3s+t5upjRljMqpqL127JfIicD/DZAs8ujxm02rFT8tCG49SRIsKX2PaMJOlGnUcu5LIqQKCVNfh1MnAHfhg5OTHKjKBSCryBFqV0Y9B+TmnroJLajhxxsJbfb9cGqmGeXYXf3OUqdfzqIZpokTCr3RIgpdEgPtu5SDi9KbyoScild7pBEIVlEGCLBzXaNNdH9J0jqEIdfjscFtv9c1G0norAiXoFwXTWjJNOnfYml76QQCoa99LTF+k2cO0Hxa4crPwdNo97GY5RdsUxFOxcuA6g3jrPZs6HIp0+iSOqAscbAsO7h54eZXeijnVPEUQKVk3yZKcr/0cK4ACHGh7usr2PfZmc8fxaanYLxu3n0rC96bmxC0ZiUKyYPltndvDSdF+FpMozJOrl4AcDdIQuT1Y0lt0UYpEzQ2Nhklss84o9NzJARVwPZ2gNMfRhkDvwrbPYiI9dwn6xUm1Ws7FbaP7xOFaj0YmsKuz5qnmCCSljczSzfVDPhxL4HpvoP1PGSo5x8vToIFRMuZByyNCTu5vwDSzaYI19r011x5INOmP9kMfDkIkxet4uUWl8wKDrTnYaiMMZbgaU4EtjRw5wmRDbLTnlxOL4AVg8ZFWpcZA+WI53wD1uNygvJrEdeJkMqkiK6+0PSEcQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQC9K+44qeg/eFZBnr75NshS01HKIZlj2zYMiFCRsbHG3slPIHcS9kfN8leMwvIN/m4H2XFkgjO46o1wY2IvAP3jdwAOfOQOxf+JAfOzPSE8qBcesMZzaB8pFFFbgcVucpWS5FmEQFZg68I6AOl/96HcWBAdmQhE/FQZtLtw2CE5PpUOt8dHiYbh6PYSpK5HUQxE7l1wA9Mo6QIxTqgpqAsfFe94xRHeZm6RggNCpJCKdvU3ycnlyDU4M43i2xcYTB0Ru5H42eb80Qy5Bmg2fmzGMQ1/5u23xqhbCHXOAboSCD6COF/o87AQ+tK4fRWLp1ZqDLhHTLOSowQ9hWko2fyVDxcDIBp/0ptqQMmxazU3V04TckwE8IUYgkZTE8CRpylwIwxGkKU+qOzSa7p/d1KG0oxW3L68JodAUu1U202FNpV95wYHRYrD9jx0xdedQriU0sm2iTxX18vI+rWNx/qIdIjTBguMbs8vwH8/zEuRDG+pjNPzqaiSSA4AEMjuFQoEsrECF3c3Us7FIhmnOzZdl7VlXYJauV7rgxdOs42+L9SN78RW/ACx5/84C3Lb96sYwqJAwi5tYOgljO7vfYE5XODLWYKEgOHD6G0S7APlG1oGcwQBBUzfpIpwr/dPZH8TVEFAbHVCotBvzoSqGxxQ1n5xfsSBzqXu/95zWQhXQg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFsjCCA5oCCQDpEbU4mm3pjTANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEhMB8GA1UEAwwYbWVkbGVtLmdvdGFzdHVkZW50a2FyLnNlMSEwHwYJKoZIhvcNAQkBFhJtZWRsZW1AbW9udGFuaWEuc2UwHhcNMjExMTE1MTEyMDMzWhcNMzExMTE1MTEyMDMzWjCBmjELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEhMB8GA1UEAwwYbWVkbGVtLmdvdGFzdHVkZW50a2FyLnNlMSEwHwYJKoZIhvcNAQkBFhJtZWRsZW1AbW9udGFuaWEuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE1yrY9anraPWrrKw707+sylhZ1v6QU/3s+t5upjRljMqpqL127JfIicD/DZAs8ujxm02rFT8tCG49SRIsKX2PaMJOlGnUcu5LIqQKCVNfh1MnAHfhg5OTHKjKBSCryBFqV0Y9B+TmnroJLajhxxsJbfb9cGqmGeXYXf3OUqdfzqIZpokTCr3RIgpdEgPtu5SDi9KbyoScild7pBEIVlEGCLBzXaNNdH9J0jqEIdfjscFtv9c1G0norAiXoFwXTWjJNOnfYml76QQCoa99LTF+k2cO0Hxa4crPwdNo97GY5RdsUxFOxcuA6g3jrPZs6HIp0+iSOqAscbAsO7h54eZXeijnVPEUQKVk3yZKcr/0cK4ACHGh7usr2PfZmc8fxaanYLxu3n0rC96bmxC0ZiUKyYPltndvDSdF+FpMozJOrl4AcDdIQuT1Y0lt0UYpEzQ2Nhklss84o9NzJARVwPZ2gNMfRhkDvwrbPYiI9dwn6xUm1Ws7FbaP7xOFaj0YmsKuz5qnmCCSljczSzfVDPhxL4HpvoP1PGSo5x8vToIFRMuZByyNCTu5vwDSzaYI19r011x5INOmP9kMfDkIkxet4uUWl8wKDrTnYaiMMZbgaU4EtjRw5wmRDbLTnlxOL4AVg8ZFWpcZA+WI53wD1uNygvJrEdeJkMqkiK6+0PSEcQIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQC9K+44qeg/eFZBnr75NshS01HKIZlj2zYMiFCRsbHG3slPIHcS9kfN8leMwvIN/m4H2XFkgjO46o1wY2IvAP3jdwAOfOQOxf+JAfOzPSE8qBcesMZzaB8pFFFbgcVucpWS5FmEQFZg68I6AOl/96HcWBAdmQhE/FQZtLtw2CE5PpUOt8dHiYbh6PYSpK5HUQxE7l1wA9Mo6QIxTqgpqAsfFe94xRHeZm6RggNCpJCKdvU3ycnlyDU4M43i2xcYTB0Ru5H42eb80Qy5Bmg2fmzGMQ1/5u23xqhbCHXOAboSCD6COF/o87AQ+tK4fRWLp1ZqDLhHTLOSowQ9hWko2fyVDxcDIBp/0ptqQMmxazU3V04TckwE8IUYgkZTE8CRpylwIwxGkKU+qOzSa7p/d1KG0oxW3L68JodAUu1U202FNpV95wYHRYrD9jx0xdedQriU0sm2iTxX18vI+rWNx/qIdIjTBguMbs8vwH8/zEuRDG+pjNPzqaiSSA4AEMjuFQoEsrECF3c3Us7FIhmnOzZdl7VlXYJauV7rgxdOs42+L9SN78RW/ACx5/84C3Lb96sYwqJAwi5tYOgljO7vfYE5XODLWYKEgOHD6G0S7APlG1oGcwQBBUzfpIpwr/dPZH8TVEFAbHVCotBvzoSqGxxQ1n5xfsSBzqXu/95zWQhXQg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.gotastudentkar.se/auth/saml/logout"/>
+    <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://medlem.gotastudentkar.se/auth/saml/acs" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="sv">AgeraMedlem</md:ServiceName>
+      <md:ServiceName xml:lang="en">AgeraMedlem</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" FriendlyName="norEduPersonNIN" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Montania System AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Montania System AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Montania System AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Montania System AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.montania.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.montania.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:medlem-saml@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:medlem@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:medlem@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:security@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index b9c062ee..00000000
--- a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-07-05T08:39:55Z">
-      <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/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för Göta studentkår</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for Göta studentkår</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDrjCCApYCCQDOi6fRpM1uGzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEhMB8GA1UEAwwYbWVkbGVtLmdvdGFzdHVkZW50a2FyLnNlMR8wHQYJKoZIhvcNAQkBFhB3ZWJiQG1vbnRhbmlhLnNlMB4XDTE4MDcwNDEzMzExN1oXDTI4MDcwMzEzMzExN1owgZgxCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhIYWxtc3RhZDEbMBkGA1UECgwSTW9udGFuaWEgU3lzdGVtIEFCMRUwEwYDVQQLDAxBZ2VyYSBNZWRsZW0xITAfBgNVBAMMGG1lZGxlbS5nb3Rhc3R1ZGVudGthci5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMlY3sLNuur0tS9ZGkjFHkrH4xPL1K3u0HmuHyKMsfW8o7pB8/IhQnhpoCyN87C7NrIBEk+leFS2WOJ/5REBQM7+JFpOGBSx/SBAqKI6u6rmoXYuWsW+0MJlKFB04QD3bo0mWNdz5ZgmS39cddPBUwsPUMpRryA/JDgl2/yq8w4DHK8rN0j9thrMzpajbzztxE1RV9kF/wjBv/2hIvNaQs3qKRNEcVLwsP0rN5yfXbglRSBPyvpwhj1LJwdJ8lkMqQXcfKySmODB7vUCR2bz01WwaoPENzrKNTsDWootKnz1abNxi5N+vfKmvOTalg4g1yMqFhWyqnYV8hUvWAFpk60CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAg4qAK4Cb6Xbnt2IbFB6qrPrFelK+M8wO1Lo8zBziApQPxF2wlWkazODQrGxPl3gMWr8Y5LlwptdNQcmUzXL5Pm7dlKkvmh0inFnnDrZ+M1kzSw41qrs4Lf/mriHA0aOG7uXF17+sDZdVUVkBDt9YOys9tBw4sorPkrprOcmcGH4bLhLfJJrmsq3Viz84QY5pxuIEDN8viGdPRNGuhQTufMaoht6F00jEVCIj2FeCnubiCCzWDDVUR2wXrodQ/3eVS0mbzqb3AWwHn0EPevrkNZqF6x1Uab86z2zZ1E3y2zJRND8N5wGug8YQujyIXvvzuBNhfSiq7/XcHxKINYILwQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDrjCCApYCCQDOi6fRpM1uGzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEhMB8GA1UEAwwYbWVkbGVtLmdvdGFzdHVkZW50a2FyLnNlMR8wHQYJKoZIhvcNAQkBFhB3ZWJiQG1vbnRhbmlhLnNlMB4XDTE4MDcwNDEzMzExN1oXDTI4MDcwMzEzMzExN1owgZgxCzAJBgNVBAYTAlNFMREwDwYDVQQHDAhIYWxtc3RhZDEbMBkGA1UECgwSTW9udGFuaWEgU3lzdGVtIEFCMRUwEwYDVQQLDAxBZ2VyYSBNZWRsZW0xITAfBgNVBAMMGG1lZGxlbS5nb3Rhc3R1ZGVudGthci5zZTEfMB0GCSqGSIb3DQEJARYQd2ViYkBtb250YW5pYS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMlY3sLNuur0tS9ZGkjFHkrH4xPL1K3u0HmuHyKMsfW8o7pB8/IhQnhpoCyN87C7NrIBEk+leFS2WOJ/5REBQM7+JFpOGBSx/SBAqKI6u6rmoXYuWsW+0MJlKFB04QD3bo0mWNdz5ZgmS39cddPBUwsPUMpRryA/JDgl2/yq8w4DHK8rN0j9thrMzpajbzztxE1RV9kF/wjBv/2hIvNaQs3qKRNEcVLwsP0rN5yfXbglRSBPyvpwhj1LJwdJ8lkMqQXcfKySmODB7vUCR2bz01WwaoPENzrKNTsDWootKnz1abNxi5N+vfKmvOTalg4g1yMqFhWyqnYV8hUvWAFpk60CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAg4qAK4Cb6Xbnt2IbFB6qrPrFelK+M8wO1Lo8zBziApQPxF2wlWkazODQrGxPl3gMWr8Y5LlwptdNQcmUzXL5Pm7dlKkvmh0inFnnDrZ+M1kzSw41qrs4Lf/mriHA0aOG7uXF17+sDZdVUVkBDt9YOys9tBw4sorPkrprOcmcGH4bLhLfJJrmsq3Viz84QY5pxuIEDN8viGdPRNGuhQTufMaoht6F00jEVCIj2FeCnubiCCzWDDVUR2wXrodQ/3eVS0mbzqb3AWwHn0EPevrkNZqF6x1Uab86z2zZ1E3y2zJRND8N5wGug8YQujyIXvvzuBNhfSiq7/XcHxKINYILwQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.gotastudentkar.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
deleted file mode 100644
index aeae9f1f..00000000
--- a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-08-20T10:29:20Z">
-      <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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medlemsportalen för SAKS</mdui:Description>
-        <mdui:Description xml:lang="en">Member Portal for SAKS</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDoDCCAogCCQCsCozRqQII5TANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTMzNzUyWhcNMjgwNzAzMTMzNzUyWjCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOtpxt8zrxK9uEbSPQyGtuqI+/BUG2gAHKW6oasYKPn0p8II0IPd9S6Kb+Kn1uZ3ajk8HBWxAV6KqIpvpiJbaYO1S+K1JRWfpf9A7hdz8Wb9lTn6CcCXa5lftoyekDt65g0/hf1GenLjJj3C/2A3e2y1McU4O5/ODKCLLuSBLXf1upDPIU+NhcG+HXIr9M6ZeDvWF/FsX4HlNHungp3/1o/i6GH20j8JD+YjE6wG3jGNqBcWsnHYcSegBwq3C1g6N7R5hewpa6EzCpjCPSsKBwNP6Le/1yXywsCOeEYbpYd0YFzugmmnx0vMw/VuCfHQ3UkWp3p3AtfL+wpSEoNuiPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKQj9iPSrQXgYjOsQbiMkDQoS/+5OUqEMSsshUIngLWki3R1ywfRt9oaHD7o7INMjQM+izFj26F8vtcQqmwm1HS3zdTlhF5p3kvw84jogaS0LsF/lBjjynEXbQK7FifGwakP3ExcZtE/K84l1FWvv6QaMbNnbdHd5zdxsiT4kTJy1O6wHFYeDLF6GmI8KjKTAP7eLQ7GhGna2fIiNEIV8GhDMhIB3Mi50tR4Se9uK7MduFgFZgsoJ1SEmKji+zM3vFlhmYUjtZoQ10MgOsHWdaYmhlUCBaKmtbMMSnfBL7wBkfjdhPDTk+EWmCNT+EugFF3AF1XCSeAGypuztwlwhXg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDoDCCAogCCQCsCozRqQII5TANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwHhcNMTgwNzA0MTMzNzUyWhcNMjgwNzAzMTMzNzUyWjCBkTELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEaMBgGA1UEAwwRbWVkbGVtLnNha3MuZ3Uuc2UxHzAdBgkqhkiG9w0BCQEWEHdlYmJAbW9udGFuaWEuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOtpxt8zrxK9uEbSPQyGtuqI+/BUG2gAHKW6oasYKPn0p8II0IPd9S6Kb+Kn1uZ3ajk8HBWxAV6KqIpvpiJbaYO1S+K1JRWfpf9A7hdz8Wb9lTn6CcCXa5lftoyekDt65g0/hf1GenLjJj3C/2A3e2y1McU4O5/ODKCLLuSBLXf1upDPIU+NhcG+HXIr9M6ZeDvWF/FsX4HlNHungp3/1o/i6GH20j8JD+YjE6wG3jGNqBcWsnHYcSegBwq3C1g6N7R5hewpa6EzCpjCPSsKBwNP6Le/1yXywsCOeEYbpYd0YFzugmmnx0vMw/VuCfHQ3UkWp3p3AtfL+wpSEoNuiPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKQj9iPSrQXgYjOsQbiMkDQoS/+5OUqEMSsshUIngLWki3R1ywfRt9oaHD7o7INMjQM+izFj26F8vtcQqmwm1HS3zdTlhF5p3kvw84jogaS0LsF/lBjjynEXbQK7FifGwakP3ExcZtE/K84l1FWvv6QaMbNnbdHd5zdxsiT4kTJy1O6wHFYeDLF6GmI8KjKTAP7eLQ7GhGna2fIiNEIV8GhDMhIB3Mi50tR4Se9uK7MduFgFZgsoJ1SEmKji+zM3vFlhmYUjtZoQ10MgOsHWdaYmhlUCBaKmtbMMSnfBL7wBkfjdhPDTk+EWmCNT+EugFF3AF1XCSeAGypuztwlwhXg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-logout.php/AgeraMedlem"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Sölve</md:SurName>
-    <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml b/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml
new file mode 100644
index 00000000..e624f320
--- /dev/null
+++ b/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://medlem.saks.se/auth/saml/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-15T13:17:20Z">
+      <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" 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>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Medlemsportal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Medlemsportal för SAKS</mdui:Description>
+        <mdui:Description xml:lang="en">Member Portal for SAKS</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.montania.se/produkter/agera-medlemsregister/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.montania.se/produkter/agera-medlem-en/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.montania.se/medlemsportalen-privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.montania.se/member-portal-privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" width="180" height="74">https://medlem.saks.se/images/logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" width="180" height="74">https://medlem.saks.se/images/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFnjCCA4YCCQCOmMnr3+tybzANBgkqhkiG9w0BAQsFADCBkDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEXMBUGA1UEAwwObWVkbGVtLnNha3Muc2UxITAfBgkqhkiG9w0BCQEWEm1lZGxlbUBtb250YW5pYS5zZTAeFw0yMTExMTUxMTIxMzNaFw0zMTExMTUxMTIxMzNaMIGQMQswCQYDVQQGEwJTRTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEVMBMGA1UECwwMQWdlcmEgTWVkbGVtMRcwFQYDVQQDDA5tZWRsZW0uc2Frcy5zZTEhMB8GCSqGSIb3DQEJARYSbWVkbGVtQG1vbnRhbmlhLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxhReii/mXCcyoBIsHBU1ly576cpcU/bFO6A8mHeZ+2oDNdCChu1cljT4VEpVDIMA/CvahNiRajlDb8o98lQ6/cLwsmybJu5VaF9Az6d0rlFkh9zb2wtwFbQeoJYYeDaXoAHRXixFwEMeBcM9DmBACL2CJTiIW5EzkXS4WR0rkF6VXuY19UYbZcNpf2bdTeXe42Mc7DIMyImNNdaGSeWm9rDrmAFDPH/tmPFZzcefzHJPwnqkscoFC9cBnwjBtXVre50sDojygzA3NYHMnfmXJOmu/FlZTrDZrSd4iRcsaPJwLCfpFMnTbt7gd4Cc0iJ3rLVD2dSaY+e3wbZuZQfKk9JHSES4V4ka5E2b3C3/opuru6a/twCB/y8kS5w/S8U9Ney4eViJjZ/ck8MOfwKFGccZD7iqBClV/EimKClxPu0vWOfi+ZWt2lLNzk2tQ3kLYEM3EqMvd0flCFuhKVZg6pOKZKJUSYxSPLiEi9Z+KwpfptXyHItqr/lCiPTBhI8nI0Ch2l/0kISrUMBASYE1lYr/3XYazrbXuJ82ncG+D12sAXLJLluteMAb1C3vbQJdrLW3Z9C5yS0BIgosZs3ZNTMAX4DHvWFSEE1lU8zn7CipZKN3RRbfZE5bSWDe84452PXIJkuXwzQ6tvkLGK9CdHUdca0RqQasapm1EEFlYHsCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEANVgzaQ+11nY5ng37BHhkV7mNYdxwnaO7h5Pxz44dyCIHxceXgqdAod//QibDF64/sDkds28TYHnJqEtkAdq/OD9L1Fho50zxP5w9RVrnHENooUsNjoQRaZQa6YjfwE11QM/SVgsNiB2P3OjY5PKC7M9pNFQU+P/nHwba/gCVhBYaQQoxgwiREL/VyBQMPg0szNQ3i8z/yPAjqMzElaqWDihAhDWhIQpnTW2bvcydlQVc/f4FjZhc5wocKevrXT/Nw8v7DoeQwuUaIimLHOMiC2gCn45vSAy402Tjwahzk9ZDLjVgrKBje4Y/ZKGCar/ctKOwzqD6xKQvrETlOSdDIn/oHYt3kUyqfEIPdjSraP6zJUQRgOCfoBkkHndaT3DIPe8UZWy0KmV7dPveLcUxJWlTkUqwa64/xXnOzM1CE0hJUeoFiOwYidQSHRR6nnHDzg58znjXHFWCd7XqaEgd0+9CDrtSbWCpWtOijB7vu54AjJtd4UEF3HxrO0Lklvt8IvDpYckLctBN3oBrVuhW6xTbv/Ig9FnCGQU8ZmBYQWcFs9jLDRclKNPFAj+VfMas+njnESXVxVn8RNaUU62gVUJmgs3HpUtJ8ew2BL2UiO0wlGC3FWvtyjcxSW08vrjRQhfRopEm/e1fw/KY3k+7DayP5kSeSx8phODYNC7S6XM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFnjCCA4YCCQCOmMnr3+tybzANBgkqhkiG9w0BAQsFADCBkDELMAkGA1UEBhMCU0UxETAPBgNVBAcMCEhhbG1zdGFkMRswGQYDVQQKDBJNb250YW5pYSBTeXN0ZW0gQUIxFTATBgNVBAsMDEFnZXJhIE1lZGxlbTEXMBUGA1UEAwwObWVkbGVtLnNha3Muc2UxITAfBgkqhkiG9w0BCQEWEm1lZGxlbUBtb250YW5pYS5zZTAeFw0yMTExMTUxMTIxMzNaFw0zMTExMTUxMTIxMzNaMIGQMQswCQYDVQQGEwJTRTERMA8GA1UEBwwISGFsbXN0YWQxGzAZBgNVBAoMEk1vbnRhbmlhIFN5c3RlbSBBQjEVMBMGA1UECwwMQWdlcmEgTWVkbGVtMRcwFQYDVQQDDA5tZWRsZW0uc2Frcy5zZTEhMB8GCSqGSIb3DQEJARYSbWVkbGVtQG1vbnRhbmlhLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxhReii/mXCcyoBIsHBU1ly576cpcU/bFO6A8mHeZ+2oDNdCChu1cljT4VEpVDIMA/CvahNiRajlDb8o98lQ6/cLwsmybJu5VaF9Az6d0rlFkh9zb2wtwFbQeoJYYeDaXoAHRXixFwEMeBcM9DmBACL2CJTiIW5EzkXS4WR0rkF6VXuY19UYbZcNpf2bdTeXe42Mc7DIMyImNNdaGSeWm9rDrmAFDPH/tmPFZzcefzHJPwnqkscoFC9cBnwjBtXVre50sDojygzA3NYHMnfmXJOmu/FlZTrDZrSd4iRcsaPJwLCfpFMnTbt7gd4Cc0iJ3rLVD2dSaY+e3wbZuZQfKk9JHSES4V4ka5E2b3C3/opuru6a/twCB/y8kS5w/S8U9Ney4eViJjZ/ck8MOfwKFGccZD7iqBClV/EimKClxPu0vWOfi+ZWt2lLNzk2tQ3kLYEM3EqMvd0flCFuhKVZg6pOKZKJUSYxSPLiEi9Z+KwpfptXyHItqr/lCiPTBhI8nI0Ch2l/0kISrUMBASYE1lYr/3XYazrbXuJ82ncG+D12sAXLJLluteMAb1C3vbQJdrLW3Z9C5yS0BIgosZs3ZNTMAX4DHvWFSEE1lU8zn7CipZKN3RRbfZE5bSWDe84452PXIJkuXwzQ6tvkLGK9CdHUdca0RqQasapm1EEFlYHsCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEANVgzaQ+11nY5ng37BHhkV7mNYdxwnaO7h5Pxz44dyCIHxceXgqdAod//QibDF64/sDkds28TYHnJqEtkAdq/OD9L1Fho50zxP5w9RVrnHENooUsNjoQRaZQa6YjfwE11QM/SVgsNiB2P3OjY5PKC7M9pNFQU+P/nHwba/gCVhBYaQQoxgwiREL/VyBQMPg0szNQ3i8z/yPAjqMzElaqWDihAhDWhIQpnTW2bvcydlQVc/f4FjZhc5wocKevrXT/Nw8v7DoeQwuUaIimLHOMiC2gCn45vSAy402Tjwahzk9ZDLjVgrKBje4Y/ZKGCar/ctKOwzqD6xKQvrETlOSdDIn/oHYt3kUyqfEIPdjSraP6zJUQRgOCfoBkkHndaT3DIPe8UZWy0KmV7dPveLcUxJWlTkUqwa64/xXnOzM1CE0hJUeoFiOwYidQSHRR6nnHDzg58znjXHFWCd7XqaEgd0+9CDrtSbWCpWtOijB7vu54AjJtd4UEF3HxrO0Lklvt8IvDpYckLctBN3oBrVuhW6xTbv/Ig9FnCGQU8ZmBYQWcFs9jLDRclKNPFAj+VfMas+njnESXVxVn8RNaUU62gVUJmgs3HpUtJ8ew2BL2UiO0wlGC3FWvtyjcxSW08vrjRQhfRopEm/e1fw/KY3k+7DayP5kSeSx8phODYNC7S6XM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://medlem.saks.se/auth/saml/logout"/>
+    <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://medlem.saks.se/auth/saml/acs" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="sv">AgeraMedlem</md:ServiceName>
+      <md:ServiceName xml:lang="en">AgeraMedlem</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" FriendlyName="norEduPersonNIN" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Montania System AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Montania System AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Montania System AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Montania System AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.montania.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.montania.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:medlem-saml@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:medlem@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:medlem@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Montania System AB</md:GivenName>
+    <md:EmailAddress>mailto:security@montania.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 619eaf36..5ee81d25 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -28,6 +28,9 @@
   <xi:include href="swamid-2.0/www.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-2.0/www.universityadmissions.se-aws-sp-en.xml"/>
   <xi:include href="swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
+  <xi:include href="swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml"/>
+  <xi:include href="swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml"/>
+  <xi:include href="swamid-2.0/medlem.saks.se-auth-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/confluence.its.umu.se-shibboleth.xml"/>
@@ -441,9 +444,7 @@
   <xi:include href="swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
-  <xi:include href="swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
-  <xi:include href="swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/koha-test.lub.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/primula.lnu.se-shibboleth.xml"/>
@@ -717,5 +718,4 @@
   <xi:include href="swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml"/>
 </md:EntitiesDescriptor>