Resolves SWAMID-3559

7 files changed, 218 insertions, 275 deletions

diff --git a/swamid-2.0/login.sto3.safespring-shibboleth.xml b/swamid-2.0/login.sto3.safespring-shibboleth.xml
new file mode 100644
index 00000000..ab8c2da1
--- /dev/null
+++ b/swamid-2.0/login.sto3.safespring-shibboleth.xml
@@ -0,0 +1,72 @@
+<?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://login.sto3.safespring/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Sunet Cloud Services OpenStack</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIETjCCAragAwIBAgIJAJXapy65TmQ7MA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
+BAMTHHYyLmRhc2hib2FyZC5zdG8xLnNhZmVkYy5uZXQwIBcNMjAxMjAxMDg0MTM3
+WhgPMjA1MDExMjQwODQxMzdaMCcxJTAjBgNVBAMTHHYyLmRhc2hib2FyZC5zdG8x
+LnNhZmVkYy5uZXQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDLJEy9
+vch54e2m1Ga1Nw7bjcQZ2T3HyJ8o8osdc+6sgOymb7/UTUzSDG4aSDmHItW+6M6b
+UOlE2Y75hOZwMCX1UTUx9ymym/aRnx++wzmPhjSITaQ3fBS5XgX6pESD8ZH8huSz
+swLL78UHs7ATr7JwhnTDCTNWnm38mzXPM+x+eVdgGXpHNt1Beo3JG65qJk07sUl/
+24KflztbaMkCwSWXaHno8nR0u0bFoBeceJY2r4uP8J0BBW/wF8RNxppE4PU1T/9o
+IGLCXcHwuoPQV5tytfAcMMT43OxwiC14nCcc/p4VL6nUfzhH17DkykxUtcY746vM
+QegPLhOn5b60Tbvo7WZLYD27nQ8VX1xFMrWusYk+coZdXF2yy9UrXXFhKKkIkSLe
+yDR2NgjICzQjNdIS2+nG6RErh9c2FHgWYluAyqG9Bdv2M5pnakBC18tnK1u6TBM+
+20V4Uoga8n++G//TKACPOhWN897Fckwbi+MrveRam54gx4KB67EhO563sj8CAwEA
+AaN7MHkwWAYDVR0RBFEwT4IcdjIuZGFzaGJvYXJkLnN0bzEuc2FmZWRjLm5ldIYv
+aHR0cHM6Ly92Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0L3NoaWJib2xldGgw
+HQYDVR0OBBYEFBf/ZPT3JkDtcaQOYSHHMdT8LuE6MA0GCSqGSIb3DQEBCwUAA4IB
+gQBJvRL5ft6kFifPWxr70CTKhSM/1YfJDc6QT2Gxqhz6J5ZWmElnBoqgKZOq++VQ
+ye8X0E3bl1olDjfk5yw60gN1LbpXVZrsCuUqb6mb1JY5funqiyuCP04lcoXtVmur
+S55FJ5I+6wezoto8yd7GbGkXeSVtiFR131mPfVSHkoFWMkNBGopFXIqM3StfIm9Q
+xFjwYHun0V2WH6peM1aroZ9ROSuqSJxKfGnfav/vfUXiEY+5jNRdwFt5c+Cp27Gj
+YjcfGiB6IDmGlPSA3Fsl5OxpmfAtCIZc843KVVq11OFaRkQ9MwA4l8sc6LM7AEOG
+qG/0jMjJ9sR880zo8H/CYe3K2IMv9gljJ379E/+TjYI3/Ng2dfFD9xcjM/PKBMH3
+0OAG46vMdscG8wXpwJk0MDBqDW1JUxgQQsmFv2z0dVsTB2V1yFwrkyORUnyP/1LP
+58jYXshzlQWtOAv/r0xGqWBhHbBS+mQlED8KaJVrQQvkD8aCGw3okSDf9TaTBUH6
+VOc=
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
+    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
+  </SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.safespring.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Safespring</md:Company>
+    <md:GivenName>Safespring Support</md:GivenName>
+    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/login.sto3.safespring.com-5000-mellon.xml b/swamid-2.0/login.sto3.safespring.com-5000-mellon.xml
deleted file mode 100644
index f71f4466..00000000
--- a/swamid-2.0/login.sto3.safespring.com-5000-mellon.xml
+++ /dev/null
@@ -1,93 +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://login.sto3.safespring.com:5000/mellon">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sunet Cloud Services OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICzjCCAbYCCQDwu05k3Z8WpDANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDDB5s
-b2dpbi5zdG8zLnNhZmVzcHJpbmcuY29tOjUwMDAwHhcNMjAxMTMwMDkzMjU4WhcN
-MzAxMTMwMDkzMjU4WjApMScwJQYDVQQDDB5sb2dpbi5zdG8zLnNhZmVzcHJpbmcu
-Y29tOjUwMDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLbJzYn6kM
-+u5z9XP5rg7fJ5qLZ9OsEpJUQ6ft2h+OoJhyEXvi6kM21M1VOS5jtW4CUJIwgizI
-9GVsQFj695oDdD7Zy6wAdyLZp7ObeZXuCknqOnJPJxLUJdZ6mEXkcgEqmeR75mTq
-um3ZJEtyX2xg0NENf6i6Pdm9D5DqIYb2dKNKUKmkLoE+QryREDQFFaU1+puK+0SR
-TUe2dG8UsvXKJf//qLY2++cskgarm9a81wDUFQ7ODqqFayN5cF7lOmxa9KNfdRN1
-Vhib0n0V2KDbSvXpA7629zL2o0evMmZ+WsUfRHw7FLF/Da3xkPSSvZK7J9LoND62
-qPCiFP1R4u3HAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAL1MbIBfrIekBkYhExNV
-k/nF1M70hIBh6V8CY1BAb+NtyByRgNsXnW4v4op/Diu2NGRs+F+KEMbtaszPq28Y
-GjCb+k3lYy5A5Vdret5g0yOwIIT5QsVFbwXRUelbRKL+QmpNsRghcdkrzAEfJt5+
-SXL3xIh/kGKxPRs91JANbBAc1t9zeWod/ZE02McZPyMme4TI2QWkQEpJ3fu3bH+U
-Spru4XxsytZ7+H9cYrNd/aboyy/soFVlbFCv/BlQ7cxK0eFPmjk/BVn43gwRfN4Q
-Orakux4EIY5nhcWWaJB4eIQ2V5LwfKePnY01dF56laQVv96HgN0Qo9ZxG9ftGv+C
-aZM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICzjCCAbYCCQDwu05k3Z8WpDANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDDB5s
-b2dpbi5zdG8zLnNhZmVzcHJpbmcuY29tOjUwMDAwHhcNMjAxMTMwMDkzMjU4WhcN
-MzAxMTMwMDkzMjU4WjApMScwJQYDVQQDDB5sb2dpbi5zdG8zLnNhZmVzcHJpbmcu
-Y29tOjUwMDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLbJzYn6kM
-+u5z9XP5rg7fJ5qLZ9OsEpJUQ6ft2h+OoJhyEXvi6kM21M1VOS5jtW4CUJIwgizI
-9GVsQFj695oDdD7Zy6wAdyLZp7ObeZXuCknqOnJPJxLUJdZ6mEXkcgEqmeR75mTq
-um3ZJEtyX2xg0NENf6i6Pdm9D5DqIYb2dKNKUKmkLoE+QryREDQFFaU1+puK+0SR
-TUe2dG8UsvXKJf//qLY2++cskgarm9a81wDUFQ7ODqqFayN5cF7lOmxa9KNfdRN1
-Vhib0n0V2KDbSvXpA7629zL2o0evMmZ+WsUfRHw7FLF/Da3xkPSSvZK7J9LoND62
-qPCiFP1R4u3HAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAL1MbIBfrIekBkYhExNV
-k/nF1M70hIBh6V8CY1BAb+NtyByRgNsXnW4v4op/Diu2NGRs+F+KEMbtaszPq28Y
-GjCb+k3lYy5A5Vdret5g0yOwIIT5QsVFbwXRUelbRKL+QmpNsRghcdkrzAEfJt5+
-SXL3xIh/kGKxPRs91JANbBAc1t9zeWod/ZE02McZPyMme4TI2QWkQEpJ3fu3bH+U
-Spru4XxsytZ7+H9cYrNd/aboyy/soFVlbFCv/BlQ7cxK0eFPmjk/BVn43gwRfN4Q
-Orakux4EIY5nhcWWaJB4eIQ2V5LwfKePnY01dF56laQVv96HgN0Qo9ZxG9ftGv+C
-aZM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
-    <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
-    <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.sto3.safespring.com:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Safespring</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blue Safespring AB</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Safespring</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.safespring.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Safespring AB</Company>
-    <GivenName>Safespring Support</GivenName>
-    <EmailAddress>mailto:support@safespring.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Anders Vaage</GivenName>
-    <EmailAddress>mailto:anders.vaage@safespring.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Safespring AB</Company>
-    <GivenName>Safespring Support</GivenName>
-    <EmailAddress>mailto:support@safespring.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/v2.api.sto4.safedc.net-5000-mellon.xml b/swamid-2.0/v2.api.sto4.safedc.net-5000-mellon.xml
deleted file mode 100644
index 88b13b25..00000000
--- a/swamid-2.0/v2.api.sto4.safedc.net-5000-mellon.xml
+++ /dev/null
@@ -1,86 +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://v2.api.sto4.safedc.net:5000/mellon">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sunet Cloud Services OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICyDCCAbACCQCjm05KUR+CvDANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBt2
-Mi5hcGkuc3RvNC5zYWZlZGMubmV0OjUwMDAwHhcNMjAxMTMwMTAzMTEyWhcNMzAx
-MTMwMTAzMTEyWjAmMSQwIgYDVQQDDBt2Mi5hcGkuc3RvNC5zYWZlZGMubmV0OjUw
-MDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoXDCUfjVKYg+w6ExF
-jbbqoTQOEfngCTn8dwgHun9cEBOM5MN/6NFm1jVVJjwvq0zCIhnSFZXQAEJRx6t2
-UTL15ynW9r9hVj49sAzsZyyjSaTBqmrGkm2KVl9xeAlTV7tLDSaPt7IA5oCFbnis
-IA68og7xLcrg2hVIj3DLabi8Atc9k37McYV4ZxJYm4LvlPebzrzuqPAPIDvCbApW
-jbwyYEfU8HS9qAxLC3nOKqZ0EWNMV59uofpcn0jCBxGfeccMEOV0ITbZKb3HFC+k
-WzJFlFsBguYzJMUgAsykCnL0KjXM8Hlqj9xkc9pNSKj5kKqUery3OknZ+Jt4aJ6x
-VPCZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH7gsPBc/QoSpH47Oit/Cu5mnNZJ
-7SDj0td654ULuCfHQFowZavC8XflJsJ7Jx1q2X+tsK1+MnuFTxib+IuZ9JegLEim
-EmMKvRPCjjFpah+Ag6thvcSjGHnkXloNkP6eQPTkVpcEJ/vcy7evKczX3oCsV+9e
-0Oq0nX8mQlxIRJyYmP4Oo1rH5DfisLVZ5J6mrMX4py9SURye/1S/FELCKA6+M6Ci
-nJFJxR8PAoE8E3OSafL5DiuAf099ru1a84dUi3QE8382RM8CT3sxbtRyuW026ZCb
-x0nGlVC5qVyncNEGPC5ExIxPRCI/I/n5Ar/DS5Lc8NJe9FbsR6G/lmlAVEc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICyDCCAbACCQCjm05KUR+CvDANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBt2
-Mi5hcGkuc3RvNC5zYWZlZGMubmV0OjUwMDAwHhcNMjAxMTMwMTAzMTEyWhcNMzAx
-MTMwMTAzMTEyWjAmMSQwIgYDVQQDDBt2Mi5hcGkuc3RvNC5zYWZlZGMubmV0OjUw
-MDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoXDCUfjVKYg+w6ExF
-jbbqoTQOEfngCTn8dwgHun9cEBOM5MN/6NFm1jVVJjwvq0zCIhnSFZXQAEJRx6t2
-UTL15ynW9r9hVj49sAzsZyyjSaTBqmrGkm2KVl9xeAlTV7tLDSaPt7IA5oCFbnis
-IA68og7xLcrg2hVIj3DLabi8Atc9k37McYV4ZxJYm4LvlPebzrzuqPAPIDvCbApW
-jbwyYEfU8HS9qAxLC3nOKqZ0EWNMV59uofpcn0jCBxGfeccMEOV0ITbZKb3HFC+k
-WzJFlFsBguYzJMUgAsykCnL0KjXM8Hlqj9xkc9pNSKj5kKqUery3OknZ+Jt4aJ6x
-VPCZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH7gsPBc/QoSpH47Oit/Cu5mnNZJ
-7SDj0td654ULuCfHQFowZavC8XflJsJ7Jx1q2X+tsK1+MnuFTxib+IuZ9JegLEim
-EmMKvRPCjjFpah+Ag6thvcSjGHnkXloNkP6eQPTkVpcEJ/vcy7evKczX3oCsV+9e
-0Oq0nX8mQlxIRJyYmP4Oo1rH5DfisLVZ5J6mrMX4py9SURye/1S/FELCKA6+M6Ci
-nJFJxR8PAoE8E3OSafL5DiuAf099ru1a84dUi3QE8382RM8CT3sxbtRyuW026ZCb
-x0nGlVC5qVyncNEGPC5ExIxPRCI/I/n5Ar/DS5Lc8NJe9FbsR6G/lmlAVEc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
-    <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
-    <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Safespring</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blue Safespring AB</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Safespring</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.safespring.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Safespring AB</Company>
-    <GivenName>Safespring Support</GivenName>
-    <EmailAddress>mailto:support@safespring.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Anders Vaage</GivenName>
-    <EmailAddress>mailto:anders.vaage@safespring.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Safespring AB</Company>
-    <GivenName>Safespring Support</GivenName>
-    <EmailAddress>mailto:support@safespring.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml b/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
new file mode 100644
index 00000000..9f787619
--- /dev/null
+++ b/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
@@ -0,0 +1,71 @@
+<?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://v2.api.sto4.safedc.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Sunet Cloud Services OpenStack</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIENjCCAp6gAwIBAgIJAJQvqB6/7/hSMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
+BAMTFnYyLmFwaS5zdG80LnNhZmVkYy5uZXQwIBcNMjAxMjAxMTIwMjM2WhgPMjA1
+MDExMjQxMjAyMzZaMCExHzAdBgNVBAMTFnYyLmFwaS5zdG80LnNhZmVkYy5uZXQw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCzTrMnvOPERqWLvIZIlVON
+dCnMOXsdQQsQkpMKwPT73Ct/fkx55NMxQON+yC+1fJ7dga3ovWKNm+EZOKR37sDB
+GcQA1/9z0Gv+3VQ1g5Txm3Y1VYRwV8jkLcPyr/qpnSwiyMD+Bz0kAlgm1n1HxVaH
+L/ewpkzpsFbTKfGqEuU2NQEH7OpbVwp/8nQb6771Sk01VKUeQ79HS2rbMa9FuvR+
+yVjAtKW3cU0hfFYDelCsaeM1DWWUfypfFLbAbY+pbWLqr1npMO4eu/jR6TKvykyd
+6+rAgPtV9JrW5Jp+crjUcxvJFEAY4XXC5hvS3GV+F81r+wv08eWZeMp0nKK63Lgy
+sUMxLwqOVn7R14ifA4/s7LMWDhs3SrU/2DYEmAgcCFTRNg2CpZxXHB1KufrdtFk4
+S7hkdU1CPLDXx/ExP2MEQa8MVgmO633LRS8Xk8m1lUEQGvmcYVhjdTF2m5/ifQZU
+9+gS6DFN8UV1S+KRD6jJIo4q8YbKJSVDYDiOp2MffKsCAwEAAaNvMG0wTAYDVR0R
+BEUwQ4IWdjIuYXBpLnN0bzQuc2FmZWRjLm5ldIYpaHR0cHM6Ly92Mi5hcGkuc3Rv
+NC5zYWZlZGMubmV0L3NoaWJib2xldGgwHQYDVR0OBBYEFFPXcSnL02pP6ZbLOGQp
+Uh+Y1p8UMA0GCSqGSIb3DQEBCwUAA4IBgQCBWhHz+NJesbt0GaZE72lZDiYLSg+O
+ijBbbpmgCs4PaCXeaG7HlY07XwXtfbPQNUIPKEkLj2EZXddI9a0KO1Kgn0wed7cB
+A1OittZ9JdpE9hcrEXukpRWSeRUcDj2B24Vy0iysfl0rkQStcMkjgdPt1mTLH5cA
+DKG4UMuEKi6wTGzuwJbQHwlImR2bezNcq/14B/mOtwtKmWhtloun42E+ZZ7RrXXh
+bVnA8OidD3EaqkinVTl1WKzJFS7g8SV/1/gAcZB0Z57F4rQFaMP6L1mzlPo5Ltp3
+PNWJQVV19dAxetHf25yB/msJ1inx8e+cfLG2WnR6DfB6KL2yaFf/uTK04kIRJSjS
+pWF03q85fN6qxG4ItyFKbApuJzlgEPqOna1c5XGh9/51Jv6daOiiLFgwFjCxsCjd
+kGA+PIXVzHT09LFm2cq62L4liLzAp6JDCmucaRxqisGIthGbhQpIO0zjgRzh4Vo0
+/SokNCR8kWnzQPxO2BBsEdRZzXaxOAPuWlA=
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
+    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v2.api.sto4.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
+  </SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.safespring.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Safespring</md:Company>
+    <md:GivenName>Safespring Support</md:GivenName>
+    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/v2.dashboard.sto1.safedc.net-5000-mellon.xml b/swamid-2.0/v2.dashboard.sto1.safedc.net-5000-mellon.xml
deleted file mode 100644
index ee7b4baa..00000000
--- a/swamid-2.0/v2.dashboard.sto1.safedc.net-5000-mellon.xml
+++ /dev/null
@@ -1,93 +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://v2.dashboard.sto1.safedc.net:5000/mellon">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sunet Cloud Services OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCCQDV4l16Ke7pXzANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCF2
-Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0OjUwMDAwHhcNMjAxMTI2MTQ1MzUx
-WhcNMzAxMTI2MTQ1MzUxWjAsMSowKAYDVQQDDCF2Mi5kYXNoYm9hcmQuc3RvMS5z
-YWZlZGMubmV0OjUwMDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
-o0I726WMavK1chbtgCUy+Yn7T1YcsnJ8fpIU0SLBe4JdYxszPRI+LyQvJWzxD8aG
-r4P81HrheREex1SpYM0wim4VBc1B08+m0rUP3OHYH2bB6txV38BiyFEpanVAD+xY
-rT7WhRI73jbw3OH9hqGm+esg0cDmycc4+ifCf+sKthbcVBrBErP7AvEae0rBnLX7
-/rWRXoB24jpwyYL88+n80o6VYmJ2J7wikR0rije9sBpPl0oufIfYgm2raoQV1nsS
-w70gcL3uZbmvdyrGy4Egh/lKY4Uk2GDQEP5vy8zE+bfpiWpZPKq3Uq4fentUcozb
-smXaxjIwokuUWOy3Z7WVAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJWjtKs5hVPc
-udGgp32iVVrEuB5k0RywqDy04+IR+l7cEIiWfNYavYAT7v62k2S42L76dmP3pBOn
-wwXWFl6oBM/PkC+yvhO32YeuYgYXhh3KMMjmdzcdF2jMNZHIq/K+hFF6PC2W8LtF
-vICQ+aqILiS12lMNaS5vSJdNQSof1yey5hjVz48CUhAUp+8bG4nhlNXirdSmIQ3k
-gxlUzeCg29hnmSDs+72Dc1C5sQJ44/Z+Jx1REEzitNeXUlykNfgT/fJsx95GIOPL
-0VHiCzVaJ78uGlH41sJX+s68miPpM04p8za+dXpmZ3uQ0Oqc0/JHceNYHdfbvSAZ
-2oz66hCLwGU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCCQDV4l16Ke7pXzANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCF2
-Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0OjUwMDAwHhcNMjAxMTI2MTQ1MzUx
-WhcNMzAxMTI2MTQ1MzUxWjAsMSowKAYDVQQDDCF2Mi5kYXNoYm9hcmQuc3RvMS5z
-YWZlZGMubmV0OjUwMDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
-o0I726WMavK1chbtgCUy+Yn7T1YcsnJ8fpIU0SLBe4JdYxszPRI+LyQvJWzxD8aG
-r4P81HrheREex1SpYM0wim4VBc1B08+m0rUP3OHYH2bB6txV38BiyFEpanVAD+xY
-rT7WhRI73jbw3OH9hqGm+esg0cDmycc4+ifCf+sKthbcVBrBErP7AvEae0rBnLX7
-/rWRXoB24jpwyYL88+n80o6VYmJ2J7wikR0rije9sBpPl0oufIfYgm2raoQV1nsS
-w70gcL3uZbmvdyrGy4Egh/lKY4Uk2GDQEP5vy8zE+bfpiWpZPKq3Uq4fentUcozb
-smXaxjIwokuUWOy3Z7WVAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJWjtKs5hVPc
-udGgp32iVVrEuB5k0RywqDy04+IR+l7cEIiWfNYavYAT7v62k2S42L76dmP3pBOn
-wwXWFl6oBM/PkC+yvhO32YeuYgYXhh3KMMjmdzcdF2jMNZHIq/K+hFF6PC2W8LtF
-vICQ+aqILiS12lMNaS5vSJdNQSof1yey5hjVz48CUhAUp+8bG4nhlNXirdSmIQ3k
-gxlUzeCg29hnmSDs+72Dc1C5sQJ44/Z+Jx1REEzitNeXUlykNfgT/fJsx95GIOPL
-0VHiCzVaJ78uGlH41sJX+s68miPpM04p8za+dXpmZ3uQ0Oqc0/JHceNYHdfbvSAZ
-2oz66hCLwGU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
-    <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
-    <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Safespring</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blue Safespring AB</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Safespring</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.safespring.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Safespring AB</Company>
-    <GivenName>Safespring Support</GivenName>
-    <EmailAddress>mailto:support@safespring.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Anders Vaage</GivenName>
-    <EmailAddress>mailto:anders.vaage@safespring.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Safespring AB</Company>
-    <GivenName>Safespring Support</GivenName>
-    <EmailAddress>mailto:support@safespring.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml b/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
new file mode 100644
index 00000000..b343b505
--- /dev/null
+++ b/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
@@ -0,0 +1,72 @@
+<?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://v2.dashboard.sto1.safedc.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Sunet Cloud Services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Sunet Cloud Services OpenStack</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/Molntjanster</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIETjCCAragAwIBAgIJAJcLyHdonAWdMA0GCSqGSIb3DQEBCwUAMCcxJTAjBgNV
+BAMTHHYyLmRhc2hib2FyZC5zdG8xLnNhZmVkYy5uZXQwIBcNMjAxMTMwMTYyODE5
+WhgPMjA1MDExMjMxNjI4MTlaMCcxJTAjBgNVBAMTHHYyLmRhc2hib2FyZC5zdG8x
+LnNhZmVkYy5uZXQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCs2Sll
+UpybtYoyfa8jGQSXwIbz27wEUQ+eD7S64rQrd65WsBgaLA6KisFRqvAGc+XZ4Kp1
+Gy5/Z23RE3h0PeoWLHl3BSwXfVLqr2d6xPfH0ypde1LurU+4nidGxSwDTdmWJShG
+0aMT8xRXpQ1l0DlXRwfOsqMlbE2IEkuJpaRbqpmicg9rxIxndPBOAgK0MxettlLR
+hOfBAn51Tbk+ltJKHbEyOPRv/4iu3kDtnG/2GELGieSJdKsTBpM5RPDHgZfrfB61
+X67g7XP51qM9SrNpGTO2pgaf2yLIeA30f6doQJRPPYZRBUYjEqmCkKPe0Xa4bFjO
+g4mOq8mrbJaofQB621cPo+jJRYHYpoHqbbPs4x6uWnWcHH5IUCMgsFD26qM5BR+i
+YZJkTsTt1pK89gMXnCQZMTk4sqKxwqQurIhAvZeL1puxcR5FM0crCriIv8R2l0LI
+LZA3xcyrCWcrhtQsIrbKm3i1xBbqT8SgjRY8e3mgnKOgeHQrdTivYv0clEkCAwEA
+AaN7MHkwWAYDVR0RBFEwT4IcdjIuZGFzaGJvYXJkLnN0bzEuc2FmZWRjLm5ldIYv
+aHR0cHM6Ly92Mi5kYXNoYm9hcmQuc3RvMS5zYWZlZGMubmV0L3NoaWJib2xldGgw
+HQYDVR0OBBYEFDziH9/zY4tiJEr6XoFfdGV6819wMA0GCSqGSIb3DQEBCwUAA4IB
+gQAMzU05TMuosKoO3oVn1QSymfdL/Rj7sDuzbo024gBdjKL0H2RUGneS2iU4umdX
+kOGquRm4ZfVjuz2WTy/OnuJDoPIV/ehbAT0PivAe/2DCbKtiZ7UkIm4mRsEOe6Qg
+MVpueXEPs4mf5NTHaagh6fgC9afEHIaVSqup+wMZF/lSgz0CAuO3qCXC8KZRnAsj
+ZK+OWe5+XUkYyftCzLq0aOyjTkvU6vJeCpru/IB7aNudnfFrAEdyD5c2o8lbWmP4
+My8DMv7Qeg7KqZ/DeXm5Dk3sOLtvB6ki90jNNUrw24iFMfZ6P17RxLjLefxJ6eTS
+XrvbpH27EA4wHk5VKn9PSWXyxaxv+cEUSEBTCFeWq10/kZ+n/eknlXeZUknaK7kx
+w9OzqKa9I5LyupRo/4WhPJvEaKSniSfUxHHSC9wT6nz2SUoqGPOHPtyk5JVL9sxO
+F/QhYLMLru1u9EaRCpzt8XLKhNqE9nm+T7jywkxHuoMcNUvSOD8TqdrEv+dMMIKA
+TH8=
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/postResponse"/>
+    <md:AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/artifactResponse"/>
+    <md:AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v2.dashboard.sto1.safedc.net:5000/identity/v3/auth/OS-FEDERATION/identity_providers/nordunet/protocols/saml2/websso/paosResponse"/>
+  </SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Safespring</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Blue Safespring AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Safespring</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.safespring.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Safespring</md:Company>
+    <md:GivenName>Safespring Support</md:GivenName>
+    <md:EmailAddress>mailto:support@safespring.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9586aa9d..8376e6a3 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -662,8 +662,8 @@
   <xi:include href="swamid-2.0/tds.test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunid.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-2.0/eduvpn.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/v2.dashboard.sto1.safedc.net-5000-mellon.xml"/>
-  <xi:include href="swamid-2.0/v2.api.sto4.safedc.net-5000-mellon.xml"/>
-  <xi:include href="swamid-2.0/login.sto3.safespring.com-5000-mellon.xml"/>
   <xi:include href="swamid-2.0/campuskort-test.irt.uu.se-.xml"/>
+  <xi:include href="swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.sto3.safespring-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml"/>
 </md:EntitiesDescriptor>