resolves SWAMIDOPS-6386

author: Leif Johansson <leifj@sunet.se> 2011-12-19 09:21:04 +0100
committer: Leif Johansson <leifj@sunet.se> 2011-12-19 09:21:04 +0100
commit: ebd10760109e458f69b5186a7dd83bd9d566806a (patch)
tree: 87ba064f8b1d32312742aacaf91cd009852de928 /swamid-1.0
parent: ddec17dba6b13c497c786ae10ea5b79e71c30fef (diff)
43 files changed, 2239 insertions, 0 deletions
diff --git a/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..7e5bc1b2
--- /dev/null
+++ b/swamid-1.0/at11.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9034314455a680ce6d81f3b8a0b1749b7439dc3b" entityID="https://at11.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>at11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://at11.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=at11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJANDF4JozA8JNMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWF0MTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTMzMFoXDTIxMTIxMzE0
+MTMzMFowHDEaMBgGA1UEAxMRYXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDnKm2nhCzGWhJzOzCnHGt5XHzzIh8+cj4Rr8bS
+Gy0e+6mrcKW22K26bYDJaS/N/896KiKZvPlNndsuReLQrdI8U6QIJQwN3Ywh8VRD
+GJzyLoLoBHbx1TxyWOvTv67gNU/KxFhohfqyh3sZmLzNPllywrKDw92+ZM+iurlb
+2/KGtdMkb9TrLLNbVKbqfUpDgC4NYaRS8R9JRTH/T5ljHDOhDZdka4toT1EsxLoZ
+4ZBC2W5asNfYl1z0OMVGcIF6HHIWzrx6xC45lVno0GNH5syG87TO3shvRdHCTHxK
+3CBYghDsKGQRb3BPiGAscWS4TOflFOaUmjVaaDuD0jEM62kVAgMBAAGjZDBiMEEG
+A1UdEQQ6MDiCEWF0MTEubGFkb2sudW11LnNlhiNodHRwczovL2F0MTEubGFkb2su
+dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUF7/sek8lHr5/n/+20PFjxKGC//0w
+DQYJKoZIhvcNAQEFBQADggEBAGvwBNDdiNbSmzmKyDTGCFA7z/6yfu9XR0sC3K5b
+6MmCwiaK6J05B575HVKe2clrcLrKDIPFG+9KxXj8rEyyhqi9RtjNxWTH/thSBO4q
+pf1P0K+PTwv621tHQ5ImGDKb6KZBGby3X+65VxUevvhZfmxBq2asOBOGcwfwQ9kJ
+DxKxLZoX41ZyX2xeWXNx0zCyT5uJPckqFwwrhpLEm12NWCdaP+v3Ij9TI8Oyv5AY
+uU3VreB64f1jHCu5pVXj76xsngziC8kHMWeZlGMsJJtmY1zNaGMFuut9Aa+EF1Y8
+4KIL+YCngtznR9qXQy9LxZFzyfUAasIIwqEMj3hJApZk6EQ=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://at11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..d4052637
--- /dev/null
+++ b/swamid-1.0/ft11.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1d0fd30550fa270e271cab110ee78a41ed20c834" entityID="https://ft11.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ft11.ladok.umu.se</ds:KeyName>
+        <ds:KeyName>https://ft11.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ft11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJANtbtklz05rBMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWZ0MTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTMzNFoXDTIxMTIxMzE0
+MTMzNFowHDEaMBgGA1UEAxMRZnQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDfLU/sYujYYgHAiUmNh1vlaHRa2RMcgQ/IR5Um
+7yniNVVyVXvHxqLREuST5IAaMbh12az7g9hdSm6JhDfaoHXwahL/BGp18vtNktpv
+JQL9cJheOxKq6YcDlRCl9tPSDZBxNB+v3y7g3ULyAv76xWBxlEBDmXI0QnZA8kCv
+EXZqKL8wROnZn0a97Vms9+kdnkYxnVeh8QW8q6thHcz621kuXNh9pGmhecj2RPlb
+jKb8L/a7DNeRFJDs6yZjfiQSS7fQ1vTg2L9YENdA7QKsgOd/Lrz4TaNi7EJ6tr22
+aAvvzKpgOSwlF8R0FQkMVMujWt8Z6zARQUwm6Q2R8+Pdkh+xAgMBAAGjZDBiMEEG
+A1UdEQQ6MDiCEWZ0MTEubGFkb2sudW11LnNlhiNodHRwczovL2Z0MTEubGFkb2su
+dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUtUb0gPLYY0CkSmck208LHi9xHp0w
+DQYJKoZIhvcNAQEFBQADggEBAMqyWMw/U+gNDjQ43Az8xqMc5OButif55s1gnu/N
+BiZMi1Q24HcTB3U3rZX0J8tHxUx+mafrYBe7PCO+XDhPhD73sNI53CG4UhAdD9hW
+ZeYhpSUYi9veyecETO2ELMhsnw/hyGf8jHTkSPfXn/KW1rSYCKMR8yEgPj2b3IAU
+tTmrX0AN8z9lR0m/A7bQRG0diz/xSi/GSuJylX2ub3cAGamGZUfUezXW/0UFfcJX
+oGWknQPhM+a4qV+wqpZJsuu/1vlRtoarHoMzKfCXj3dlnjnYEsJ6b1448FsglEBG
+cAPbVt5WXPJfyQ9aIwH6FMg6rzmos2O4n7Us9gatMw6tTGI=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ft11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..f2a9cfc3
--- /dev/null
+++ b/swamid-1.0/hubbletest.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_434239750b0788bdd367312da2620d585abb5548" entityID="https://hubbletest.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://hubbletest.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>hubbletest.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=hubbletest.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIJANqWy4ROsxP8MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2h1YmJsZXRlc3QubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MzkwOFoXDTIx
+MTIxMzE0MzkwOFowIjEgMB4GA1UEAxMXaHViYmxldGVzdC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtzAbNpVTDhNJn6xAzatXS
+pLnJNXU/OEUsRzFvtJxHo2t/vhfJLJWsbSz4iNvCjvuaGhN1nC6qt90gd4goLGG8
+qT69iznSypgCLHptCkMUW8DzYLx9+Mi24pXSMI7pq2x9S1GZ6TMeviZZjDeTpu8e
+2uR6yz2ufU4utTdFgINmKQQGgJtrOHngDsG0DvyDy5kqGcESxIytguFV9grDB63V
+ROQ/6CJ4upGXHFVT9qB3nAHKL5hW6xvKytSmIC6ukcV7CwOHaAGN7CmhiLhYLr6Z
+E5x29NIkSIuZ6RksNBIbXpbeaVaXnRBr/I9IZhlHsQM6WASgx8wR0OXmmqQPqduz
+AgMBAAGjcDBuME0GA1UdEQRGMESCF2h1YmJsZXRlc3QubGFkb2sudW11LnNlhilo
+dHRwczovL2h1YmJsZXRlc3QubGFkb2sudW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4E
+FgQUPAZXAor+fQd6f+IGyA2YTJTAvzIwDQYJKoZIhvcNAQEFBQADggEBAIWscK9c
+gJW1B1+7fIb4BrqtK2GvbIBoSTqKrtIO+kgS0anyVOgWUzS7RSfLmYW9+MbpidiE
+K+K6Z/Za9QE5EjMgQxa6wutIOb+lNb8N0awncrVfJNX1eQl2XaJmC+l/+R4+UX4p
+0KZPIzx6WJcNIM8+ltM5ZXUbYp/rdigx9d8veK9rQG+9XpRpe3Ju/GFmGkKX13gR
+Pj4e3G1nGTVTYm145M1eS+pk8hcMV4LHiXKRncmwY0XgcSNHfwXO5UPYw1rbK0Fh
+ubZdMaAlXrTvU4rmu2zmpe8y04DNyTFhvltRsvpFaizhN0N2L6mSywdMl2GJ99gB
+qIxQGEdChCCBgvI=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hubbletest.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..23ea711b
--- /dev/null
+++ b/swamid-1.0/it11.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_66bc2ef594b3128359c4fd08d57576aac405d55c" entityID="https://it11.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://it11.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>it11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=it11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAMFV0Pgb7IB6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWl0MTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTMzN1oXDTIxMTIxMzE0
+MTMzN1owHDEaMBgGA1UEAxMRaXQxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC8Yp9ShPoGyk/90NP9M5rCF3ndDDtAz93AvZhv
+Dh6hQc6+ijKxXaa04dzG8cbeLmWvWYKO932XtRpgh/Gu7Nnzo6DcKdOjeB0eio+P
+VYsPCy6yVn4YR1TDzK8Azo1Nc7lxm9xit+/KWWshVF1Cp9xklsxBD9PnlJ2oH54r
+f/yRC3d81l5CNLkCQyAk5UThzgdwDwnwAmr6/0keoUe3V3oiQ1e7I5sT/JNBYN4e
+32v5+S3m0+Rkvono9zTLB02hiFYRXkZmaWBmESGq1AaIoaowIxoD8DyqSCYI+T+e
+b1wkx4LN76e4Tjd03fNL0ffZIgFV65OJcgGGPaoYIqkeL5hFAgMBAAGjZDBiMEEG
+A1UdEQQ6MDiCEWl0MTEubGFkb2sudW11LnNlhiNodHRwczovL2l0MTEubGFkb2su
+dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUqqvnl/vVaKb9aDi9kTgjQsSKrxsw
+DQYJKoZIhvcNAQEFBQADggEBAHGUHqM6b7jFoHUGlOeDxP1inH8fVJTwEI2/0Ite
+7S73a3n/o7FucRH1dyhc/LF2QDicTdCC6kL+D/WSabXDOMMKYhlO2pOrIpJK5cxk
+c6xp48ZdPJP5H354go7Ns7DOjDdFHEAKseCDmDkpbVrwPWdiaiBGaUpQ7gEPRYOu
+MQ+4jyAZFD97hMDaN83D8/JNOHMwuMMl0kkab520b4m0Xgoe8DeuIW07rX/3mJBQ
+a8TzyNruiLmHHg+q81vk7tcfYU0jiHu53BASFkkDzvwseHLdh6MV+HcuJUC+DSii
++6WPpPEemGs0njRt/Xc6qakCCWOKV880BONKtK+fVtPsE2Y=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://it11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..3cb03d6f
--- /dev/null
+++ b/swamid-1.0/nb11.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9a8be9039ec97ceb9a7cea3b52e2b8a554895fa8" entityID="https://nb11.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nb11.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAPPryjIwvi7LMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEW5iMTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTM0MVoXDTIxMTIxMzE0
+MTM0MVowHDEaMBgGA1UEAxMRbmIxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDzWb1WtFbFnJ32NQD/3sUmDR1znX4JJNpu9VNC
+Zy3Gcv1BCWjSDzohxPCF+t84+feAQpI0nzqM3+6ClaHDItfYDYCN6Ex5R/uYOfLE
+GY2roM3ppPTZnDaO+WlQ/IhQjjddykwZ/n3Qbxg73iELykx3SrM5N4Pxwiaz5rdy
+w/yKSOO4euWuaOlIjIEhRUujRqVfjzqEfPxn7YVbEHDCqtmzHAzYZMs7ykdVEkNd
+q5ZlkkrGfioLGa1gjQLkEvNEU6/JgKaCth7WXYW/FolWVf6EohXP4xSZT0N0+Gc3
+w+q7L/3EK6zuTdB2/0O61i9ZYJcQvLjOx8ipRhz9jGHIsPcrAgMBAAGjZDBiMEEG
+A1UdEQQ6MDiCEW5iMTEubGFkb2sudW11LnNlhiNodHRwczovL25iMTEubGFkb2su
+dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUfvccThAXzxCuUbVLN2+adXQGOrAw
+DQYJKoZIhvcNAQEFBQADggEBAFJyo0RCytzYQEchJWy/kG4QdFuJ9zn7HQERNFwp
+xFt9OjzICqLIMcdvqBDlkoVzJBt8u0pCM/HpfpAcI3fccwkiLKn1PLhhMlKIFUd1
+61zcRzqm5mHyGWP4mWFRFc3cCQLYCkCMqZq7eLO5uwIX8z1Z775JnbIhvt6+N4PY
+SO0Dx+pl/uDMEOxA/4UJA30SNsOlEXnunmeRdER6uxRecsuE/EHSpxYyaLNqpxN8
+46pa5eUdw5NNlBDzmUGbY9SASECnuxMjQRe+CTWFWRPSBzmzxhANrOVOdx5SL6Ou
+Zhi08S0wFSiLmVBI8dLk97mWOYwJgDwmEpkeR/ng+YkH3WE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nb11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..777f4286
--- /dev/null
+++ b/swamid-1.0/nya-01.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_448f7e3ff20aa0c94ce9e25498585ae8228b3a6b" entityID="https://nya-01.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-01.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-01.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-01.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOk5OkS88spqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzUxWhcNMjExMjEz
+MTQxMzUxWjAeMRwwGgYDVQQDExNueWEtMDEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoJRopt/Q7gbXeMHHsM9eCqsa+gyx9smk
+sK6qJHlX46CLJDJ0BdqvuUL0lSkLBXh7GsRotxvq7DKUQ3m8QK4XPBUWMxFRDSMm
+becMtyjDH4puZYTZSJZ450ICBNoY9vv7WdWbyqDkzBiyewa3t8QzF7JuFGqFMvYM
+BljDKhSIOJ+l4EGCKQ3yjnFJQsnhPIuJKnHIXHlpD79gxb3Jq7y8MMIsCsl9JkK5
+AiO5XbMkWQlEMJU4FOHw1I4ZLBQrv0qjdu+IrkiD2UU51RCY7Wq4ZpjqAiBlz5xI
+my8x/qatq6tbgynJchhIIgiwxnFEJeXvP/nz2qfs3t9CTLTyzUKSgQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDEubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRUYeiHtle+jKpG/5pk
+ZUUeHzpC0TANBgkqhkiG9w0BAQUFAAOCAQEAQp+52YesKMPZUoLnAfe8aIB02HxT
+g7Lx8BIMJ4PqrBkxSwtbQEWURqHXxygohGoTPzlFJDB++4oGghwplCLvXF27YuJp
+/K5KbQ5Si/qw4KGF2+w0jnnw0mhWaMoj3+cFu5Jzfu4GK9AfcGZzOoNGUjcs5ofx
+GZ2tHONvYzKlXvsj31ky+yS4WEMCBlgIM811Yrw6P5Vfq4py7V1Le0DWfUVwBRmR
+OJxsyizOhif4JiOQYGdK4NHpby9naFNpF4IXwtagoLY6T9Gi5ktUfqSsqqTdak/6
+1pdCY3YrggXgqqubLfIBeYxczT94rwFgraZ+oNRpUXRwy9FTEXQmog8fjw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-01.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..c81139a7
--- /dev/null
+++ b/swamid-1.0/nya-02.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_fe2962b3d14dd4ee39fc26d299ca7a10fc3be813" entityID="https://nya-02.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-02.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-02.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-02.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKXVhLJyociEMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzU0WhcNMjExMjEz
+MTQxMzU0WjAeMRwwGgYDVQQDExNueWEtMDIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvJyxiz31qltQvzgD9UfRwpRQ7TrVmLc2
++TwYpJaGCKW/go3T3ePa5eBAG1EEiJ25079O8iVEZ7U1VAynT6gfzQgycOOXvqpG
+SZ3kW10u9mw+nxaLJvDr7zo4Iw2pgGJwIxQ3Zr90pdl21AbsqIh8p2U5ob0YDdNC
+0Bu7qNhnuzalaprls11D2gJO41g6hk/poFFpw4WE2suE58d/OM6zT8+AvqxYIF7g
+u4Q7cop579f9dSQkIT03SJWycP7DT2rVkBdmVDScL2sUgoKz0bBdHLf60d2MJ4KM
+P82ltPeigfVE2OxZpO+26Y8xvEznSBas+djKEctdpMvxLpCUFozRwwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDIubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRohgptcvwggHaIcZtZ
+zNIcSH1K8jANBgkqhkiG9w0BAQUFAAOCAQEACDFsBFw/b+bFMZ6iLWaKh5sPeJ4t
+5FktV+KpErjhlb6TDchDbONhGqtPaKhDOOCWF2ixzYHGlwRchoaPdrQg3aRJYgDP
+mhouFGuZ2OMVcAkuY8zYPPlKoitud4lvCsNJZJx3Kf9fIYcQsqRXZrQh8Liucsl2
+3h5XwymthqqodNBzq7gWJkuVRU4t5HJzsqXAhaBMrPq8DmtCKzGbcLoRE35GloRV
+U/aML0q3unInrJaFvNeTZuOFlcJ6rKhm/FU/gPXYAtYaiPpuiyohjmysiM33Uf9d
+N2E7dJ3CyH08jBFitMrgOIexNlMw697ne4jPm+Iv9iJU3BOiVGWLDa6EMg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-02.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..5ee2b9d5
--- /dev/null
+++ b/swamid-1.0/nya-03.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_4e05cd051b8946b4e4fff6e8ca4d06506aea559d" entityID="https://nya-03.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-03.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-03.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-03.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJANzDByXW3A0VMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxMzU4WhcNMjExMjEz
+MTQxMzU4WjAeMRwwGgYDVQQDExNueWEtMDMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA152HWqXt+nWNSuoWp/qjt+VHq0Obj2wH
+6lFb77Ewc7DWh9DbI2V5rejH+aOSOO9QaTCsJGMiGFblf/gTrmYvstjkW8GXioAX
+X8xbO4qt19BajQPOuWs1euzYWLaxSMpMMmcl72IO3Y9ut1Uyoty0LojNAY4Tupx5
+5M8BhKOzHLXOM7lMF/F+zkQSaNGKXSdr1i9NeIdHSDXKYkjMQc9QfzfDGUpCeb1Q
+IoJ8vZaIIof2cFXXtTyWK+BxoOsEpOayMIMjIIYnEkhDX0zkYDpbJc9BEu3j1ngy
+fMeoj/d21e2vd9y0dpQk9b1SHzqSOSk6xEa29QhxM/v+eq/3IOOAbQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDMubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSztmCIgKskxWf5MvOf
+yrwUzvXX8TANBgkqhkiG9w0BAQUFAAOCAQEAGa0gOt9MGmy7KQ2Z0quHbRB9Dn2m
+imJwwFX5dNmMaigyqFikwFgBHnFVg5VHt/Pivq2YqdS2pPGHvOiuJYypq3WXBkT5
++PqN2NQ4oJpp2KO/svpRD7tZI411KSyTU8OobHaXX7IOKhHHFS59SyGKYhBDO1Gr
+8S+aj1+L8NbIJbsFnjDAF6RiAq07ofKLvIGyThnHDOwMYm/1oz4Tc8zNY3ipd/aP
+5gRrweSym4lt2j58eebxQY7GzIO80oFMSAVVkKQHVIUUjrL/Y/lDoZKS+ab+Hdu+
+xxsec10MaM5LRhAHDZrDVPMp/Q6JMCK3ZMvX1WyhhGdENT5CKTOwkoXa2g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-03.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..8aa71df2
--- /dev/null
+++ b/swamid-1.0/nya-04.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6b8ff9fc9fadaca3732452cc1bf85f22041460ac" entityID="https://nya-04.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-04.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-04.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-04.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAN/pNKqjnQl4MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDAyWhcNMjExMjEz
+MTQxNDAyWjAeMRwwGgYDVQQDExNueWEtMDQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0UhO3OFE3rJBO8gD1fdA4liGoigs3o7J
+PI6RJEroLXs63xjLq/NtEEW9/Hycz9J6PX/+/Lj01K5j4MVGZ8H5fv7KMZeVsjU/
+PiMHlu2h6GAYZSUuhkantNSAfzwplZPHt8wJVWk915GM+obfhpQrZJ0DghC5ZYU6
+BmDEZLX142aZdcrHfO89pfFu3Jgh6HnCjTGdVegn0ty28q5hBjUoqlplzALOUnYr
+S4SojmOTU46llGn+rRmKbXjUEuUcwPDGezKYqOY7Jq45MakrzEYXDOyCtZGrpIYL
+zmR94m1HSDBXUrff9uVNjbURAOa6Ol/r7EiiatJGTunbXgJYphjzTQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDQubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRTt1w4nUHCJjvCf+vS
+tq6u2WaHgTANBgkqhkiG9w0BAQUFAAOCAQEAUYHtfw/rlrRrWkTUWxtVapK9SRXT
+lgpW4uxKOSSAQdDgE6Nexq5K3VVnMOqBt1myIasDWzMVniZ9wGs4apxzewGFg2+i
+y/4NcKmdNV7gLYLjemUebnS0ea6uSLih3CA/hyOV3oeR5eSLKG/xEFYPAmqg/6Er
+JCXw/VmZV7H4b9Y1CSCe+4WTH6mAlh8Zm9brdbGSoLgQNiaUN9XsdhIle94KIXej
+sxSk50S1ljwxYrguwYfQP4dPEB1mn9oBIwGA+MFfXOch5YIYWYhdhS8JKD+33e1L
+yfok40PeW6wNzSsPTbDuXCg5ylpa6erNDbWvovVYM6DNUpN0u4slj2kn5g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-04.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a2b56462
--- /dev/null
+++ b/swamid-1.0/nya-05.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1dfc29462ec422eb794822921943c943211b7eca" entityID="https://nya-05.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-05.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-05.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-05.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALyDIxwjHTT7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDA1WhcNMjExMjEz
+MTQxNDA1WjAeMRwwGgYDVQQDExNueWEtMDUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApsttLbU44IZwfkE1i+lYbh3v902LBKXL
+PmPhQNU2vuSQVFBpInH5DWzuefmAyEPJ/WPOMUa/Xkyrs80mF4AHUuRaH9VLxLcG
+7uQ5ENbzLQ6iQoc77K1yOCD6R6oEu4NlkKo6a2D8ufzdvaivEBFhUPSoJF5bRY/u
+n0l/6mFxo7rJkJmo3kEKTmwu+1VQQ6WGW8nikfIblJpvz5i087RFItqyj+qBgSHt
+t+itdhU8jyM0MUcO4NSDU7MkjAzWYg/7XN16muD/bHXZiO8L8/hbTL3WSRkbD17z
+anzX5UAX602ISUxNINhWHcjdhEvCfaO7hIbHgH0enMD964HzsCReIwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDUubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRYKOZhjQS+oiTecauf
+gzCYmcgvBTANBgkqhkiG9w0BAQUFAAOCAQEADEJiZIy2MKpap1oiRtfe0Paco1vn
+Ib9znt11U3sgT798j6tZcoKRdZyqXzqjCjYIMaATN7x6VJuZBAJGdPvg1Pq/bZ/5
+mIB44zarRLUWcdIQY4PVc7Kb9NLsprf/0NuSlyJAvCobtChO+LsarM5zJNlk+t1m
+5vA7hxkZcFHwTlWpmerjXLg1xqX/D/EuXkfMnd44XXixvaN/1Csflx/DfUdIm1YR
+fBr8xsQYIgJ92okJahZ3f0blo/RHzEB3AGUKOEsauzM8+vMHgAJXHFXNiMqNclLq
+UloWvFxri1sjNtHE89jjeXRj2AEozuiMmMjOImiLXZKsc6KoZ6cBtwXuSg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-05.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..359ad863
--- /dev/null
+++ b/swamid-1.0/nya-06.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a7fd8e45f2b8f51d4057362939f0076e18782657" entityID="https://nya-06.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-06.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-06.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-06.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAN45t3SCPRIiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDA5WhcNMjExMjEz
+MTQxNDA5WjAeMRwwGgYDVQQDExNueWEtMDYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo24qP2amED1PXbQQ3i5NkpRvItQutad3
+6ynuNzka1Ad2R1SwqxkBHzOfsEEOrfcaYSeD9nTUvGZajJosKKphtWL+MWoEPMnQ
+zWhH/EUbB6pKrfVxn1M5NWERxFdSIpL6JHEHUAMm13I7hZvt02jKqTVa+gICoHrI
+5WuXPmoyzNnbdvw8B7mEPCyKE8aORl/FAINetbyy+TtIioyP8aSMJgpoBm5tgOKN
+JSNBZC6SeHTQDiCRdluZu6On+V9y6WS9a+zwuZKtwaZEsjns6SJTrnnfMgnB+eQU
+3uPiXy6Dgi8OMI3nPcPMdQQ7QIrJva7ao5NtNqQJ4p+WPfFOiSJKaQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDYubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT7LsD3jinvBBq0gQ6O
+G3I5c5VHIDANBgkqhkiG9w0BAQUFAAOCAQEALJWcrU9iUx7PzOzK/YBehQGLCtfd
+n/vWMfJdiaQC3yCaBroTm/6yewSr0a2+ekC8Ph3Mhohi5YcZB2hl8Q56D/TszPqJ
+RO8hipB0lDmNUY2/Jz8oOpyulI/5NxZsxxWoNZOr5K0UFlUJGCI47joux3jiQjeM
+OqA8HZN2Ni3dJue9aMdTy13bdpKR/6G2Ytj+HMysnSh9WrTk+vHTCFJi14OP3IuC
+n8H5pFJ9CPQj2RwRs2Lf/i8+c1wXJhDwUJBTE0ypxh22prR5d92WZIemL3nH1Aq1
+8iiAcG5jJSuqu1WpwXp5kW3HnHUjKBDEetZVAlOEtZFJM24FmmlAxj19fA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-06.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..c7bd726b
--- /dev/null
+++ b/swamid-1.0/nya-07.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_891c0bb1f67de9204b2b733edf530abae65ba023" entityID="https://nya-07.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-07.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-07.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-07.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOsHSvIeKBPNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wNy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDEyWhcNMjExMjEz
+MTQxNDEyWjAeMRwwGgYDVQQDExNueWEtMDcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0wXxwE1N89lMzChcIvd120DeUXk8pXkc
+GO3kTR5nYaOZaG5T283P6uXn30cqmNBaOalrhbDt5lWPZOU9uLH1QS7R8RHUZhR3
+4JvAkM9D+IF/Sl2xemPvhlowl/EDLrYd7sD1bkh226F0Kq8qh2KX0SmMOGNgByzS
+5jWbkmt3A8B6bUNt9q1vuPCG6WYNbu/d1h5Gyqg7MY1xjGCAYYUgf69AlLNohgs8
+d6J5aO9Oo2ArxU2TdP+aJc3RoWwHdUbRXth/DxNpZFIRKtawkaz2icKpC8HOHc9g
+dvYH0Wt4lLHi1g+iCcyAju6GRV44Yzl6rIImeUsgUhRDr6PGUxy/YQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDcubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT4jE6x1AfPrVgy/eo1
+Te51ctgOvTANBgkqhkiG9w0BAQUFAAOCAQEAetCGuV7AVlZjspl8BEq8UBaV0Nxg
+Bj8JoYZhXd9Q12BHWMJ9KivMcD/GKvevHRNnQ10UBSx/DjXGvlM+PohOPhOCHwuT
+R3PEpFljl3+N6MnsyherTGYRNRMSr8voNRP4HlDj7oCcDUaqLtXNeDzClTOGcy8t
+GoXvFV5stm2UIboKwakq4WyyYTrKt26dniCXPnSw4EIisybzohTDRh8e0MioDOAN
+GQCEMYSG6ycLQ0LsSsNovS8tER3oMbuOt43AujZxkPQsGUXIkHNIoCfD2DuIcc4w
+4BJFE4QduYnG5AYwEaE0Y17R6J2K8TBSpqSijqRI7ggjP8dMHd3JQrcbbA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-07.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..ba00696c
--- /dev/null
+++ b/swamid-1.0/nya-08.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_8ba22cc0b4a81516e8780163804e5ed28be444d9" entityID="https://nya-08.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-08.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-08.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-08.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMSqH+D44ITHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDE2WhcNMjExMjEz
+MTQxNDE2WjAeMRwwGgYDVQQDExNueWEtMDgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1WQ/M1g7SAC+TI9CW+ttb1XY/LCtxaBB
+kS2eHcQcqhjjhHzCeSa4T+rHHqdk5fCZAR3q78y2V4wzY3Asd2AUNraAfR+ie0aA
+I9Wpc5RAt2Lt5MDGODOaV67IZfVPOCf4TnGfiOinalj/OHaLEYQPETNqltYrT8ol
+h0hd3idXkpFYhZpvNFwk1a+FS+NNjd/bujFlZFYBrsQGW2BrDEYPlvakS2PJ+p34
+NCHNugcJOJDe5FvwiqMqaEL0jYjp3B4lDfHeE2q6XU1d3acmxR99UBUwWigsV/GI
+PxWU0GdJ1wp9SyuX8uqFn8a5QPC8egdaayiinamjXCZh1YZn7AZg5wIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDgubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTAaSUUwMEwvtfnKTdV
+HzmFV5VuiDANBgkqhkiG9w0BAQUFAAOCAQEALTyINT7P9fuAnfEmXqfwUZusEl75
+5IuYYR+sn1lUCsR5r/jTqfeoasIY+/x2ADfukeP09xC4AiLOeKdwxZs6OKnPUkIS
+9oFmTtRaSVCWBnXPyERd48OZG2nihXZ9XW5PyFEMXcLV6DCiazShKRM3V3vE+DAE
+gjfoMCyZVNApKsiQ683e5esS5vMjZZFmuQU13O3OZbs+n3GA/aL8yYCngQrbPl0g
+fhxD3r8nftNluA0GOvfMWlUZjso9/6o9KpP5/Tc2Da+aE/ImbzwWFplRbTxYQqFw
+g5ahctVSR4PAiGMOtvqARpwdBj7fM3+Utym6dIClautnzeFrcyZRW8YMRg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-08.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..5a2e46e9
--- /dev/null
+++ b/swamid-1.0/nya-09.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_85244b842dad99e67b5028719ee2d7c6340a2550" entityID="https://nya-09.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-09.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-09.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-09.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMDWEx2nCo+IMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0wOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDE5WhcNMjExMjEz
+MTQxNDE5WjAeMRwwGgYDVQQDExNueWEtMDkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwRpIsMkkCFMEtqcsg9PT16AURNboCqXC
+01b1OKSauQXt93tn2VsoQhVoCJefLiYRRw4X0L3ZKdAEFq31LpzIiIdmIJlae4BO
+AVul3c0qjh2Y875u4lDuo9u/NGiED1wfOBwfYNIUaUBfsTA+YrDIbbuYeXxeStMl
+fvL8idQZ3GbAbMR/SB1mDyeB+YijRsBBeQzuj4AF9Hg2NjP+H8grwsvPoMlM40P8
+/Il8oT+NqVmHxU2Wmg1MkqlgKI4FrfSkj6i78LaIgOihHBu0h83R7wx2CM0mcNWM
+Y/7td7Fzyr19SrSn7b5Rh/3A14NIJ5XEJu/eZEXVpfdPC3vodeQWjwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMDkubGFkb2sudW11LnNlhiVodHRwczovL255YS0w
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQK9PQjxmWtOvJ+n8Q3
+Ou0Xs6GfMjANBgkqhkiG9w0BAQUFAAOCAQEAewQqdvOeIgA+SwJ6I/sLHUVh5Iab
+ZpzxpG0CsKn07GaiKVTHViMZdS1hTVXel9CBM+eRUqUBbR8FQVDb8tFW7gbEYayT
+neTl2PxbiIsjlJyZAIGloFhNf0y3TK0Hvuc0eqVDcLybmy9GOM85GZwwv+VuuRUT
+0dABrNWQyfq316vvDWNYYHF0/i331l27XkbV0WXqu2ffUx8lbaSTMhETR/eNvXl7
+VGHDJhfkfJ6xPJrFVTM4plJ4tZ00DzyRMKUSDkV5so7EB9ZgA889dAQHViyLvXrx
+2+Yu8CQ/GR5np56Ce/neI8MZfpx0h8pD8vWvC0Zx286MzsKMAaMSc8mIoA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-09.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..71d71ae3
--- /dev/null
+++ b/swamid-1.0/nya-10.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_8c52c7ce6656ba755006f3231a84873130783c33" entityID="https://nya-10.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-10.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-10.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-10.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPQ4VZK3spIpMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDIyWhcNMjExMjEz
+MTQxNDIyWjAeMRwwGgYDVQQDExNueWEtMTAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Y+QaGQ42e6AR60SPpuJU7YFJmT5zc+9
+djSG7CSJIRJl47uxuASvps0x3eq0GS3ytEd3+5VaASZCtKnHs0cuiGq3DMPt2ZrS
+mfUmV9F6y3rm0zoY7RJxYcRP260jlsuaXQmMBkxGR684XWkfW8eg3fop9wzJZk5k
+PJ3vStrJKlCQZzGtHEYSNbUTVx6m4WVmNB0KCeROqwNwgP3Ok8kA3j5+iprwZ8OZ
+eCz/7PjCfvC7SxAgA3m2fcdeVe+ltbpbtlgAC06kU9IgvooeJLUfhhsHvnYHQRHy
+ijJ/6bFisa37qr1a+GmCVzW76nVBqWFszWpNDnz5hyGzvGCIFh8iCQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTAubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQ5/oq3PmnVQ/NbWp1Q
+91bEYAe1uTANBgkqhkiG9w0BAQUFAAOCAQEAzOYNmaM1gqEn0wO8+9mIxIG7Eytx
+oRlXguAqrvZB9mg9X3CX0ruVthjx2aYuKB0lfZ6isouqtmf4Y9jup0caVNZUhuYC
+WQTVubpZtqu2ILLJiA9hUzZo2Ssw79K9yDn92vLSIrJW+dux9WAc+ek+A+msGVYg
+/kgysYvip99GN3T0IzUFbVUITbglryDLCjkGKABDErW9/ALbGVtiJ6teYplVy8wc
+FlMHobu3JTG1rbnDWnyEzHkkmL79o8tDhvd0ouXHjOg1Yp+E8pntAFYE/R1w5ygp
+ji8cswM9Yt1R1XEuVvfx1+gSrAPMcshA+UQ+AAaSnER7opP8TCqpmFYAyw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-10.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..868a9c91
--- /dev/null
+++ b/swamid-1.0/nya-11.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_355f7f889f4b89b403eebcdd6e05ec5913f05df0" entityID="https://nya-11.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-11.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALpIfpUa+WdbMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDI2WhcNMjExMjEz
+MTQxNDI2WjAeMRwwGgYDVQQDExNueWEtMTEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxO5S7OhVa6uVG0RKmUebRCg9vgJYCZWO
+bAubLGgC9Qw4No7x9M51xQH6TTRKyqDfxIj9AsbTtaEZvGra0Xl30ROTZOu727nb
+4g+ZT/w9M45+7ezQKy7hdAYNMjVkrNStHWz1YMbGPmuGwiNgbekmfJMTPFf14B4a
+MVorewMC3M3OKJd6ONDE62wqZLRKDE/T5oCPOFmwOJlENRdAKkOmwkn4IWrr5UW4
+GvFh4tn9vSipTFuwu/1cR/9yqfgn5CKblYDY1EwpfcWzCbbMD6b/MZzS+PhyI9/N
+SvP/WEj/UNYPScdT7D1ovc1We2a8McXxsLRS+w+oLVoL8eOxRqWKBwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTEubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQBo17maH5ODAn/VPCP
+s8D9Wt7XoTANBgkqhkiG9w0BAQUFAAOCAQEAXAUI7+d/hlli3nl/l1DXQLMoSOKg
+Ot2eNEehtm1/HeBwpPWeTgUzd+cyjCIXUAa+dFbior+kIA9c7NbOdmD98QR8ElTL
+bObf8p0knYBkiE0ncsRPT75MQRW7YaxIw7bWbXMOVI+qk8lwKfqrXeU8rkSJf7EL
+cDF+nboWwRTJXwug/jhtUycfhvBNR4/oZT4WJvsl4XvNaXPYZFo1cF0LaHvlSbyt
+0vnM9PhtOw8uak83FZze23DY3lBgrHKU/IPdMyMdppem4ZGWahDxHj8YIlzO03/q
+ee2cPMLHZ8uTBXSNov8FszLqVb+2fSkTkc8L3Jvnc979iizqAcW/c102dg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..da98d5b4
--- /dev/null
+++ b/swamid-1.0/nya-12.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_fde543a4343cd5becadc7498ead21896e9568bca" entityID="https://nya-12.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-12.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-12.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-12.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO9geC1venNIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDI5WhcNMjExMjEz
+MTQxNDI5WjAeMRwwGgYDVQQDExNueWEtMTIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo8YVVRbZCXGp/edNijfCvNi+Atz5PvCP
+jDwxZ349b1dSs6Lm+TDLfQ6AMIFki7sb3eboSBFKc75v582uxspN3oGd6Zo9ZmAV
+zX8kWmTkj3GirtCVUvtOMldTHcbFD2ff9XgP90blIzHkT3cWPoKVSQdabyNduTSz
+Dm7DCQwGCvD/mHEf8fklDRnod1tG0ZMUwUCnvQqzA/YlSVHnflwXU95UwP+ykw8F
+BFnOgm2N9+Soj7u7Oxfti88DffoGfWTOWu0YXVGlq2YyZLtRBnuytrE0G3K1SuIs
+rrWHHPVpCiHC4yWB+Qm9QLxNXIPzcD9kl/v1Yq4aEt6cU26VMc9RywIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTIubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSNCha6oR3qcNdiEmii
+SR3sZT8vdzANBgkqhkiG9w0BAQUFAAOCAQEAjV3C9I25EeQVopA5ReEqiAjVaKda
+li9uj4wJfKnLm6VJliQvx4D0uP012e930dwKIilP9rRZifkZA6g7B8YJqht4BeQ5
+70NCkpBgWzEYj1jrWwyONYIlMzZgcr/mRkf7pMK//J1iV9e1RTY/VMNaDr+2H46R
+9RtJ//YzGhMizyh7icfsl1pGeWaWVOMNCndR70mkqJKMchDlwEmt7KXYXaI3qhvI
+KcF3SINo8nkQKFmGR41FMhNu8tCJAbLM/Khg++ctc5HBuw3nM42AogcyBCe0Nxps
+D0eoqGxLTvTqC2+hDxNXRe1LrUoaBIvcLqssy5jvjRX+vi0ckO5RddMIgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-12.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..697ea2d2
--- /dev/null
+++ b/swamid-1.0/nya-13.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_7622c92f1062cc7149f06573a57ed1b6076d37fe" entityID="https://nya-13.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-13.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-13.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-13.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALL/tkObN6dZMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDMzWhcNMjExMjEz
+MTQxNDMzWjAeMRwwGgYDVQQDExNueWEtMTMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2d6EOdxnw/cnpfz+sUBLp5jtL9oSMzX
+WSC/qSISv/VysAe6PJfQGhxfhb0PsH/WAiWJwFWmegImQ2DVzlGYOOdb+mM+AHrk
+/3AmNNijIzhG+/Zm8RdvX/ERgq64xGr2uGEHQxGMu21aabkjlUppIqUeX7bPki1k
+zG1DkMpf/6yVHsXYp3ks5HtBZSFRH2FsSdxTJZ4Z5AZO8RNIDXrxsEL+xYk2hzVx
+cjJHK9zE0iTCgZ4SRJ0lTC1ZuTBE5LP9rpONilozmHhY5V7ieg6fYyMX0njOArCu
+oknt4ISNrfo8xEbZJRCsbl6mSWSB/mcckv10DafpoGUNEYs/kc6iQQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTMubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSf8iP8ZKiWAM5iUEi/
+hDBlhMGe4TANBgkqhkiG9w0BAQUFAAOCAQEAqZYZRTtxEVSU2mVJXgZaxLiZ/dNv
+nMMbRqD6P9OXHrgkzqFWLsuo3STZviwOjroJNzGDot8fUwU0/wdlKYFuS0xQ+t03
+2ZfL3aX51+Y2yh4cBalqlGxSATFVux5tHzrcoXLaelkbeKJWPmTpgXTTvjB95mCn
+2iYJ/T8xFLsJZzTAEjanF3QYpEipJhxuxeqhmsvJ5E7QnGACwI1Og4AyeSeblYIh
+ef7RS+FSTgPUp3et4oXwKmUMdiFw7YnfeQcdaTmFlaX/lwssO/zPC2tvaNMOr6Nh
+ar1z5nbbSvQmbGQ9X3H3/JRxJ8pW/dJ/6fdEpNcaQ5mE8RFiL3xmX71sfw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-13.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a113b6b2
--- /dev/null
+++ b/swamid-1.0/nya-14.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_bfd31dfd711580ae0d91a5a7bc6d44a520037c61" entityID="https://nya-14.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-14.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-14.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-14.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAL/SvvUQuNCoMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDM2WhcNMjExMjEz
+MTQxNDM2WjAeMRwwGgYDVQQDExNueWEtMTQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8V8spvD86KaqKD5DbHpdEA9S4/3Eriic
+o2tdFmiBggHKDyGJ0WSo+N2BRNCjQEDewlByCqpFQ5H8dsNfvps4A+RPpdWlJrFp
+KO3qfFG9SF9JLIWs/f0CZEVj0h+/11+bIJWRU6b7QNUTwJ6HjmJyTByBzBS5Y+75
+tS6QNQNaKly1xfFgvcaECLk1dIrOPt3kQ5rxypJ8UQdVAoeAA2tE3/GhvvDKO39O
+l0HVS1JkvXW8hnHXX5t5VdTyK1bFRQOoe9KvoCnWJ2AQKRc5qrBZCcjOqJ9Jntna
+DH0fSMANRHSSkRX/hskzoOd4eWdQTP4u+BYCxXG4sG7+Zm8uD89BGwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTQubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTGqUFSrHWGKqy+L3DI
+gYXHufOhmzANBgkqhkiG9w0BAQUFAAOCAQEAHIBLwS0e9JjzU668fBEOPtYma6Lh
+nZqIYAZhDAmrm5HVRGJdW3zClprWePRMW6DvSgWPYjgVrVb9Dd54+YIZLC61PKYR
+QQFcd1er2rXO68djIDZToHAb/O6bCxjq3Kg9HSX1kQ6HvWMrLixJyq8HH++zSmL1
+2YcgGKCFDgIR4JmUcKUostcwrfn+HEnm2YrMDxGAOxKkwMkUC2XA83os/AwaK0zM
+ZeWHUJ7G/swyYxw1UwtS+gdeCjKd91Ua1qSSCgv8HztqgPgzMtDP0bHic1pyFZKs
+8aq4wlCum7mkVAGtIWQwJkmuxXNeWkqM/jblWVqUtQDkIl2Ft1F2wdtRsg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-14.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..22e1bde2
--- /dev/null
+++ b/swamid-1.0/nya-15.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_77f17d695493842a87f7199f2b418da4c029a712" entityID="https://nya-15.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-15.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-15.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-15.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJ22nkci2o63MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDM5WhcNMjExMjEz
+MTQxNDM5WjAeMRwwGgYDVQQDExNueWEtMTUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq+quG3cBrY9nyqA9VLC7GzPSgrlsaOte
+LUyLZgqNzDHvkOhv/RJDPU5+gBzc5W+7aUN1/VP2SwwcQNUPNyLd4WBsT+MbiUMB
+CSX77jlMt31dgZC9bh++rq3MhQzz2MDkjOs+oqeMNDsfiicWkHytVeeQAD23BBR7
+OBJR9am+5E3pl+zKZPDXuadIlBAY/SUnoUpR3hGM5/ZWjxXNHQHmXXwlkQP/rsQ3
+BpmKTPFhgP3sTKHc5UryHMQnGd5gz9H9EnPf282lJYCYfTOlG5TkiJ/qjPGmO7G6
+KGtgpaAkQ8jU9LbhRdlRpdOQPg8NEyPpETIGNO13iaWkQ/dMUVqxmwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTUubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQi/d1F04lOt3rP9Lw5
+ESSmdbA7sjANBgkqhkiG9w0BAQUFAAOCAQEAQDYqHV36FsGMgLO/UJ4mepGW5L65
+TSouG/yP4n2DQTPAY+9Iqc+get9ZvuF2kd+w66W7awg+LYdbDZRDK+AEQwdJCL9s
+VWnfKH0Lp1KSM8xZ5Xx95wkAdGi/PEKJfDCAlRpEoMHGllm1jPftV0kGhAhSyqh1
+uNCxhVEdHcyvaelzf7cm0grfcFrJxl78M6C6eL3pQnG9dkIaKmUAA2cM771gIraO
+3Q10Iac3qT82DNrb0SUcWi0vLJURPmQ1SJP1xFJrF3Q8vE5pP4oDpCaOq0wqtQlA
+W0+9QcTj4ZQCjZo9d6upjsbAo/Pp6MGuOLAcRCqPt1QiE55EBnAisZmbxA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-15.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..556c254d
--- /dev/null
+++ b/swamid-1.0/nya-16.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1989763e3661c948740faa791efa93806a5dfe82" entityID="https://nya-16.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-16.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-16.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-16.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJANFMbjKxaUnLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDQzWhcNMjExMjEz
+MTQxNDQzWjAeMRwwGgYDVQQDExNueWEtMTYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2j1lXZX9rDadqcF6ibJjSMITgM3e2Us
+feEfaBmsfaIVknwkxdyZv4uROqZHd9png2MfRG02/JdeVXgbUdEOo45CO764ohsF
+uMDiu1FQDuPrlTVnDpu8cGzG4bq8PhqXdfMqB8dXnLgpW4/4dVGTQ0qzbKWyiXmq
+EwGkM2YdCV9kwcGhw4oAmcgw4XsN8sUqg9DFoEAeoLQoXGguBjQsLU67wDwiNQWO
+XfMV0nPga6mP6xEH8uMHqGYQzS00diCNc+WGstDuhrjmt3YC0wb9N/8hB3yGV8sl
+Gaw37P1J2VfoEV+77VfOGMe666sbk/kBbpZwQKbU2cl0mEvMmyQ5OQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTYubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSgPT7q0ocvrotkuGTH
+1j7y7K8RhDANBgkqhkiG9w0BAQUFAAOCAQEAfelpyu3JwSk4WmzfdPHxAzMQaoWF
+fx1T9T75EMiJiujMEk6J0GRvGX2OgRobQ6582tqBYiQutedpzlJOJriAYZoE1jxo
+74XsBo3MBI/x2cGt7CF2Cui/UepbIJiSkpmSbRAC2eVwJmEVkwjsshhtS4fDjuQE
+vdPgA3hDRl6QzuElgt3dPJfvGWwyreaijyw8m6IjYNA2ke66XIsA7mGrz7HoGK42
+Ed4TZ+AxBdNjC0mnFd5mWYE6rPfYbSHZ4R8PTtmUtSRGbjtld5bQY7R17XJT0V/v
+MEA25rcxC6D2hDL+ZQf5oi+nGHJ1PH9Qm+R9FhZRYjtAiMEy3ZKlyTDizw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-16.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..6702232d
--- /dev/null
+++ b/swamid-1.0/nya-17.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f73fab08aedb8f4528c0fccb1c8a2d7c4b4868a8" entityID="https://nya-17.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-17.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-17.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-17.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOsxrcoHLjS9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xNy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDQ2WhcNMjExMjEz
+MTQxNDQ2WjAeMRwwGgYDVQQDExNueWEtMTcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQ23FTBIKH2USIVYfwKJYR/HGiU3Nl36
+YfhYfMZsbCMpC0m2ViLtwk/N2XJLHDJw112ZqSITmVFHwdDMbpMLZtdeyocCytvT
++nBx3EaBYdoILZn5aJI9z5w5SA0XM59BD1ubtzYcoPAr9YKRuHI5F8uJOv36pmOR
+jSOYeMfTb5hTdL/wuOm/v3PPi1a4wTRQgFQkxxPTEtHrTMmSAvu31ykRgeWvOzI/
+K+wrXamK2gEfgRMQ0RCj5TlP2g4eCApol9GlKyjjDheCc40IfczEOArOk4gzF5TM
+8rVYuRykXvxkI8koocSB8V2WJmZRoypHFnmTjM64zTi/XvrwEN04zwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTcubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTHg+HkideDNZdO/hpu
+9242wuvQ+DANBgkqhkiG9w0BAQUFAAOCAQEAQlyj1+dVmy1kjsg9csb5Ur4kSdWc
+at7kQMSHyrKNHr01fOf+qiw/7YrEq9b5tR0Gp58hwASRCYvFa4B0cA+WInDndDa/
+6E1IiUGt/VS1CDM29qsidxNx9eUxPivFRjmWUD20LBS5EwtiifAoUc24RmPGAQ+o
+FiSDh+u3UZzaHhe8DfY8VcCw2sTO9LuK2PEI/nKR2Nda7+M+sy6odaPJdkGh6zJi
+QVXzC7sMf52hVktgFLtvKRUetQl4+M4xSgvnPm9Ub+ey7gBkxgUmdxGokRfqyYmV
+kcHeJzjoVblztcwxiC7gCrQIPdClYGG3O2ID8UyVskpag7HyqFhy3lYthw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-17.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..a481205e
--- /dev/null
+++ b/swamid-1.0/nya-18.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_09674f07cf28f4f2152fe6a90c23bec1fe99d6a3" entityID="https://nya-18.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-18.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-18.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-18.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJJ4j+PgG8rFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDUwWhcNMjExMjEz
+MTQxNDUwWjAeMRwwGgYDVQQDExNueWEtMTgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2B/uy5BIrLT+JDYCFZ6GgQwJEKnwSvK
+1w0cVP36afwiOJL7xJ1whf0Y/zT5il50j6MAiB/yYyG50bOwKIAxSpKSb5b0CkpF
+7S8wWZ/BcJZa5JlKqeFf+RRY6wfNpw1tpaLO+bYzxVLsdAULoDvU+sGzyBsp9sI0
+a3gJRB7AIaDIW7QY0chLVtT+n6YIKk9u4iSWFX54PvC4hU6m4bUN8a5I4pL4cKXy
+fJQ1hm9y1fSiIhpptiZuNnwYcgyu8euBiJWq4daGLKeKdI6VhWD5AJitqHYzxOho
+7ZKZyiOuC72D0qr7DpSNQ43W5Vf0Ypaexd3BANBlMxnVJcE9EX8/DQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTgubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRc3bgjSEwFTZzgoZES
+Jh5ijBurOzANBgkqhkiG9w0BAQUFAAOCAQEALnlnmfHTn9FfaWbe3YITt4yyMs1P
+Ae7Abd4ZqMmpdeUcsEBEZjiKUs/g6/JqKA4E0YGtzOEJkjxNfGdYlAjhM0d8dbCh
+aC5uJ0uwEMsbZtG91V+RBfUkFU1P6cGjA4voaqJeQf2EKu3qy8dFKU3YJKBAe1NL
+Vyh7zdOzwHfcmQqMc+EJRwaWgeNJqrBgFeExukmQ+uMj99ODI6JveSUTCZqFrJLe
+tkfn859TpDNdCXzoe2MysuwNL4IyZJPP92rLC7vjVe/DU5OkeX6QmPAJaio3Wo/1
+A6GkvQRQ+zMPxxZ8Jzq2pUpmZDR8IPAz2457UJP8N4Wa3PuH3HsKi5OilQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-18.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..6c7f94ff
--- /dev/null
+++ b/swamid-1.0/nya-19.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9697572b8e32182a42dbb99c95974d3b0c1658d4" entityID="https://nya-19.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-19.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-19.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-19.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAL+66TyFwTytMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0xOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDUzWhcNMjExMjEz
+MTQxNDUzWjAeMRwwGgYDVQQDExNueWEtMTkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Jpp6y7+IX46QINFv1yM3XpY6Q0NGIh4
+PImfGX96kX8pVaAtnztN3J6/8hK+gkMQ7/wpQbzEE9OkmDSKk7mFaGEYCiRyXMBw
++3f8OmJRUGDemIg2uxoArrQcwfFSXdwBDViPQisI3mqTuyXRSGB6YTwQ3GSvggI4
+hydbhjWELgwy/whG3W9UyTaVCv0bzw6dQK/oxFa5anfniaWYcFHvTZ+PNq+hQYdJ
+CxP49b/DU+1m9WFQnHeuj+FjfhmozvfoI4SgvbkbPDD6+7/DIiMH/fGuNf68tkZs
+mjqM/UMbvdmh2aED/BJKiGgZW34ygPWhACi31bvRhMtp9C5u8Dij/wIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMTkubGFkb2sudW11LnNlhiVodHRwczovL255YS0x
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTZjzKQmCndYt1ty75V
+viGkn28MKjANBgkqhkiG9w0BAQUFAAOCAQEAhzEoD72gUG5T44P8XMO1ofBvcmnX
+eh8S2fK6v01UR2DcdnPNHamG9ln1wPqYKEX4FNpzBlrYamXgYcyoDDOiy1D0j14k
+aiymQ3N0QdpgIu5qM6J/ClkiSRgRnjNgdNkiasMXcG+brrAN166IeK+jT43NqhiV
+vZE9YvwNZPhZC8F9us/n96cMz7lW7cvwYgFQVEwlEP7zdnkk0HeopMxVUILL7nl0
+xT357BkGKeaFoFJIqXRGubefLB5rQw//6ijvOkT+qU05LfIn/DEv8aI6QClSUNpA
+76yifJ9yA+mlhfxPNSwX7CTQ+NgJdI8PndjhTbcxKjx3huoVcD54cp4SHw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-19.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..1ddb5553
--- /dev/null
+++ b/swamid-1.0/nya-20.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_2fe5aafe1480506576a34e5cd76f7e6ff26afb34" entityID="https://nya-20.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-20.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-20.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-20.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO1vsI4TEoOvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNDU2WhcNMjExMjEz
+MTQxNDU2WjAeMRwwGgYDVQQDExNueWEtMjAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu4H+LNiwie8PcQFOt/c8Tp6Ka7/xKPwu
+HJA9aoIwcqvEBSxF6jucwUww0cIXXLAGl4mC0xQmQP5BGU3dv48y+7x/CP3ky4Bw
+SRwN8DFGxLta2yiXCoi33/1h+/QBN8NbzzGpCWxwk03pRbbH3mMvv4B0THjgXQNs
+ayrQXV8447hzAXTX6KG6/ludMebl8YN5bs0RWocnNPDyyjEeiuoNaJWFbrS38zT6
+Wz4L4tQE+oR+Ae426B/x4mDsGLKpthIlNED+aadmAMkxm7yZWaK/f3QmaEqfRo4a
+puYfm6m4BsZKRiJkT0cPdJcGad7eeAV13idF/lYZsZXcDOcwlkE+NwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjAubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQpNsdmyCE64BeqY1ER
+7KjNlLRsHjANBgkqhkiG9w0BAQUFAAOCAQEAeamP2tTjQQWBGp06OddimPaXs501
+Mmfbyx9/Ji/t0g7Ri6t6J9q7Cpm+rBNSH7TVvZ7AXsXV0d3SApUa4+C6xZPUBo+f
+caF+V6v/MmKTp+I1wzwvDtCNlSAeSpQfVIlYIB0gMlvzygSFapsPz/W+JGduBnDT
+K+e9PTWPk9p6AbZ/0HHeYHje4uxWjuZ7uY/PL0SUBjvmyvJlOPdnAu5u/CSH/c3f
+QzJR8qCTEcxD+K9MO9gWpVJMmNqg5IFOmzhYnV/rMIwFOvFYK95C2slC11Fu0mcx
+0eTEA32/UWftAHwvOTIqYSlj9b/dPnq/2vYg8bETNy3SSufuaUFIq6M/HA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-20.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..1398b5fe
--- /dev/null
+++ b/swamid-1.0/nya-21.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_4c89a69dea40de1046ce7f65f18c98bedde811fe" entityID="https://nya-21.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-21.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-21.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-21.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKOSYGaigK8eMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTAwWhcNMjExMjEz
+MTQxNTAwWjAeMRwwGgYDVQQDExNueWEtMjEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOAOmiDNCPi56qR9z3k1vw/D794YHd/C
+r/iBY0hJxynu9WMZ8OmDgrIuCRlcbCnt/fwshEYrWIMhq5+IDxa2i2SrYBktqGSH
+YnWHILgFbpZRZQ8op635sfkFRylwJ8c6gqxSJoOXMh9gTgi5w2hh6Q1A65RGG63p
+4jVOLqG8Eo0oi/gQUKYdaaN2nS952YHeSk0YYm8u7XHuzs61froqlTg+WxZeDRHI
+JCMZ9O7ts4H+WtLIlH8aoDuRJY2f49GmILpNINmBZYihf4+ss5FbHl9ANeAmVVMZ
+dleCk8Tfh9RvFIBq3e2Rif1Sk1IY1lqJT8tFGJxzIl75BBiKE+EeTQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjEubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT3pP/IYhet+6VmY+RM
+lJQYr8NHuTANBgkqhkiG9w0BAQUFAAOCAQEAEC4dwV9TnGZfEL5ca1fDmjHxINpj
+ALbjP/AJW+cVN+FDuekkZ8VtU4BkYoPML4MdoiaO3+T7Hfq2adQsN6bNhyBXP9Bl
+V60M7D+VWCSC451uTQsCSUUCfytG33GVM+Ivxi+vnTFT0ZU0XdNyhTJiHZlhF4F2
+XLYyTIAvRplV3ElXVdONlh32PduBZoHIOo7pkXBcLxJAliuXukv4hPOgVAgiibmg
++GjWWrX46wdk0vddGHHaBSANVF1bzpmK/9d9KaH5VlYgZFBLcUOsC7pvHnGgfi5E
+97ZUlG0iiQuCVhYgc2DPHAPIxdvqMP7fsbOFVyaOZQD6ppARkZyh2DrL3A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-21.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..deb76005
--- /dev/null
+++ b/swamid-1.0/nya-22.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1d0fe67d0b405921598ae386c1e0f97ce6e71a7d" entityID="https://nya-22.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-22.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-22.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-22.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAJb6YKMlMSccMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTAzWhcNMjExMjEz
+MTQxNTAzWjAeMRwwGgYDVQQDExNueWEtMjIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArJPfOYOMcKsO2tCEoXlnbco0oNhshQlP
+7SHO14NOF16JdF2W8euGpvlRB+NA39CZmvSMxNoOUmmuwmlagJ4i5fazv71blIy8
+CvuparhErcelmL44CbPTbvdqNOpLLIgWmT9/azVNMPdyHJNUvA533cB/deOWgwhk
+b8l9aILziBlFMqL58fIm7JZ6yQAROxEPUvn+pprC4+5Aoman7aXFiKT5fpXKX4w9
+zcpUTBy9z3TJUmuSIZBR5q+SKT3bMrpwVeZMhpGwbpmrjg+5gWVk2bEjzu7BjiME
+wpF+ww9eYNpsqzU4D8hPsy1XokJSd7M4ev6iJVK4Y0G7Zxj8ECWxsQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjIubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQTtSMSE6ik45DrURNP
+3yXlp7qZxzANBgkqhkiG9w0BAQUFAAOCAQEAonOEKtyv4GzqdGig//GuYhXBOpwZ
+Z6fo0N8Axa+5YSlGlM3EvXSS1+p+cPbpKPNmDxzc53F2MUoqx9EQjT5e7HBKBeZ9
+lCPuUVxLoC+1W5wH6dTwm9P86T6vVst/WcoLtFjYQ4T9BAs285oCCSepW37T541y
+jOZCrUXQwXO5mTS61kEXqA4tcYlw3MCtXKFAQa60RcZuEnlJf+qDC0QB2ErC42ot
+ddPDsaEmlGJctviuxJpn5jxlIjyZfKzsxG5/zaUGwxWVn1fQWQOTq1qyQIK9KTrB
+ZXlCO/zyPmju1bjLPNqeiNWRiBXj10LMH3e96gPcHrU82Lt9/nhfs2eq/w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-22.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..3a283763
--- /dev/null
+++ b/swamid-1.0/nya-23.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3e8b17af6b33158253f960f2bfbbfa0ab77f301c" entityID="https://nya-23.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-23.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-23.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-23.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALMtSLbFB/odMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTA3WhcNMjExMjEz
+MTQxNTA3WjAeMRwwGgYDVQQDExNueWEtMjMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoYE6NQt6vT54Y8D0O9pnT89kKAnO2YOr
+KSmX6HMHI05ErfjMSc3UH01SwwxOGrQfeGefNzwu3QL2idubpAwDmBeT9QKCo9Wy
+gMdFNoB8w7XUYHNAXJMMJBTnEF1ylXnMiZ3QYxh82oeLzZWeyB6lNU1CzzA8Ftn9
+R7r5cJqDlyxrpKsW51Br48gY/V8y2PO6wSMdX9vMkn8j8AK0An4Br5ea9T9Ov8Rp
+RjhGj3CQGI22t0a5dfYdWflGM9nMitv3aDnW0s4YLev6lARmnYfOl7gzJaLbVk2Y
+BVUy8Wamzz73cpFZHrUu08qX/dcFLntq4Q/GlXjsMMPY2Gmiao+EvQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjMubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQEXSj6fUiycSdF7Bnx
+iNYXNfU81zANBgkqhkiG9w0BAQUFAAOCAQEAVcRpb/lq59k9yLP8ZAd/TpL9vBwb
+hx+eyzoSlcjZfdr4iJpal0gbtvoxerd8W88C0vd0ZoLgtusTGmuo8V0kUx6WmYQR
+4HYFpw9ZpObpD3zq2i4J4G26rJTrdoHmmhmmyjnbHg5MsMB6jyh28Yk9RUXrTG6k
+9n7gwZ169uEXWolG1b2ch1tUJ7Tt4bHS6D8yQwC3rmIArOckL0vt9+SCOD8p959Q
+ueE7J31sPSdc0rNT/VrN+KDBteMBFVojh/KSFuKSmqjKq3FKWUWnSRQDojNW1iTY
+dA2i9sB0Cu8nKmw37PqM4mtcq371DdengqXWAtXbhTPmCRItJOIbSxBBBQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-23.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..ab87d9f7
--- /dev/null
+++ b/swamid-1.0/nya-24.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_6d9d4a8eecab0268d701d09931d10b16d28a34e5" entityID="https://nya-24.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-24.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-24.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-24.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMwU5b6xeN15MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTExWhcNMjExMjEz
+MTQxNTExWjAeMRwwGgYDVQQDExNueWEtMjQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QHDcZdS80NvgWqcTxcYKWjgKTn/cCZ8
+eixCgEI1kdeRTWdWJAggdz1gjaXqxsfwpM+DnjC9j1et00xOk9sryjl+3iJ7cEGv
+oLvD0kkfptOcqY+zV5VNSC/3QacuW93MkQEkvqpTeKJEbGbpRluF+incXqeDlGqY
+1nJYZ6Ac2k8gHMoF1PRIkaNJjhK2ki0Suf9IK2mO6nG9GEPB+ZFfaOYughv095r+
+1YXKrti4FCQH/81RuH005EbQQcE0MzD8WngFWbQ3A5JrAdPRw5+lCUum8Q3n6X5q
+xbpE5DbCsv9JjojUudk/Q0nesS0u6ZWU6gaQH/73WFI1qOrSb2qwLwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjQubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQHd7wcFAY+T5qgIHkB
+GzdILP47hTANBgkqhkiG9w0BAQUFAAOCAQEAmMF+KIpVa8l0eqOoOyaSFT86kPzj
+Ao1N/NlXjZy2zvyRVhXN7ZvM660x6FOKFy1KqIUeYiJf/Y2M3FCiD+His6YDr0vJ
+fRcEjguHKc01dYEC83hLh1DSd10mHtlb/yNPtXEjBZ3Ytl9fA7UaB3d3b9V2geah
+oGs8razeMsgqqGwx0EfKa+yH1bxlqADr+XIp3wBlsPx0Ll+B9Y8GMoi+GC+S0+T/
+XxRTKJAXoCeGHHQD+bGqDsG3+iKhlZ5E/41a9eg9fKjOObb6BI2EVIwtk7InVR+L
+3jhWFfFzqs/YZQjFrZo0Sncl03R+EzsFvmFRmYXdp89BXQOgVDml4BrCEA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-24.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..2a497560
--- /dev/null
+++ b/swamid-1.0/nya-25.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1c2d04765596b702952dbbb50f94d08e597a66f8" entityID="https://nya-25.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-25.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-25.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-25.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO7ZSc18TVEiMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTE0WhcNMjExMjEz
+MTQxNTE0WjAeMRwwGgYDVQQDExNueWEtMjUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtSvqKivRA4sXNrnw29MlUqwn2We+4geL
+32iCOTihoIP3hJN1j7Hh8rLw4K+aLEFgFP+ufA4004VasE9D/OJSG2iTT1Xvdoj5
+fnkbQnOAJ+C+gge5WaXc4HFFezdxz3bJQIFD3bKXGDRz5D2sg8yjOnPe7C8xEEEW
+F7Qltq9H1APRiWK/YNPO2COjX2fmbqfNW+mi0tPgzQDpo5UNYcyseZlLc2ev1SM5
+ZrSdHoGns/uAu0kx9KIlA88DsyZkQJEpCFO6vPu6gFlHDH9ll5awo4x93wx4IAu7
+JKlHkpQilbnaewqJfgZ8COWvTBXv6bPU6PzaqmlnmVedI+SIqu6qEwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjUubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRh9z8xSC1qtNjxw056
++rLTd06JKjANBgkqhkiG9w0BAQUFAAOCAQEAUpH8cqG0/qOAPElZ9uG+8ShkSdyH
+jAnTfhmm47B2iKbSwChskKZOYNjIFS1QrlEzdHWKvME1awtszGLSt70KdOh5TsoN
+FVPI8q83fndg6MHEO/mbNOTyCO4gPJtJSD8Re2RG7zPvt7uKojSbsuk4DUQcI0mt
+EJku3iDsNOp2A1A9c/fXwdyIzZdWn1gpwPJEH2d2fvEQOCbYmc4oh0u/3h+aEkY+
+7k387Ap8m6ySG5KVMzyY2MJjSrCaUCGy7xes85FtOBKAU6xUQ/zFE0A5AFmElcOv
+NRj6t/LuaLUR1y8KVvU3wbgIIlWGQfVzOleB/hm52MlKne52F0E4+11OGg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-25.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..e96e70e7
--- /dev/null
+++ b/swamid-1.0/nya-26.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d63f45920cf9063497b7f506e891ff0c97089125" entityID="https://nya-26.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-26.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-26.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-26.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALp4R33XExfvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTE3WhcNMjExMjEz
+MTQxNTE3WjAeMRwwGgYDVQQDExNueWEtMjYubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqX2WYVXnZ96yShE0LWkOazS1RSJCkDVJ
+lyBMVBkt/Lo+N9iCgbCqRI2/evcF8OLBt5qy8pk97LZDh6Wy3qXtIXooEiUWH2pH
+iHsQQOCEa+YRIUE5L70ZamRG/AeoqpXBwnAfk1OUy1i+B7NO7uZt4VX9Y3Ttazb4
+6njnuWaNcVPCQo3HPfSaTeu76bx8ell97T0x4biYUi4/UcMDqQSrHXPyTDmCqcft
+4u2LZtJftFoialBPZErISoxs2Eyuky4xjQL2UH8CK0ro2Xx62T+6AOKd1kNoSFN/
+bztW/5M3+GNQtCZvDUKr/qt6lElMYbNR+1JhIZJsLGVZylmAzHJfuwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjYubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+Ni5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTjXrOVbu1q1pc9HAtK
+FTf5reWyrDANBgkqhkiG9w0BAQUFAAOCAQEAcKjLV9sBDcLAYXLmnrtqpOZB+z48
+iF3UIn+kdWSL8zvnic5XlaK5zUYPQe76gICzDYXSCEYX5cidtliNvx21X2BjHM0Q
+mqU+DAtx2jMwib7Q3bG+5T8dX0D35/9vbak4EeLApAL1TkNq4NCCoqNqvYWE1fHo
+dyF+YgxLywhY4sZwz+KURwPeIqrqA7IYwb4uBtF9P0Gn9w5xfz5ujtAfUZKyhjma
+8vh/0Jzd+DEPKaqHGtsHQEPjhXP7ZqK5PAnAJ6CorBK4FgJu/EOGTcC3A4MXEoYq
+EN4xy84V9WE+bDj8Xp32IHk94hqWVgyHdCSTn37MxRLuMwE/Nof5YXRdSg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-26.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..6179b341
--- /dev/null
+++ b/swamid-1.0/nya-27.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_fb1b1de23b86e16dd4610324e6aed3774f9626df" entityID="https://nya-27.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-27.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-27.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-27.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJALGgkF8L25q1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yNy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTIxWhcNMjExMjEz
+MTQxNTIxWjAeMRwwGgYDVQQDExNueWEtMjcubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx7rtdp2Cx4AKhlVyWSmN15ybY+0Uno0Q
+oeDDXivhnCpYuP6EcvIHxfYz7pEfoSGRopnUXptk76npG32FQ9OtaNbhyIB3SfnI
+t/q0qmOxb/NrDTxpiZ7QaSepoChqEqpkq06p7Nz9BUqsK3xPwOi7Lk7OP/cJIAXw
+SFnDSszsXLHeO32wcXf/+uaSY5NAs5dO5iWCMBOPXJFCjl6nWYs7q/bBRuEzfePm
+sA5ysRKMUiX+Pq1gwLXruYcckKpRSUrNHlo/B6F0Q2KogxuXZ07cawJGyJ5QEWDI
+y5fRdAcdPx1YRT0Ne6DuWVd3+8hWWlfXGSzZLb9J3uPXqhXqgr6LLQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjcubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+Ny5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRev4uOq1I1JvonCzvd
+4wIfqljv3TANBgkqhkiG9w0BAQUFAAOCAQEAsebc0n0S1X+W4dVO/0emXYTPiTqf
+RlMYwGjXjN6kL3k5YFs2SJWheWEhijLvT9McW9IEjwNzT6cwusLbeByt5LAvSYp5
+VKctoYYX12R02mVzb7UqedZuk9IjQcbk9xE33eon7hRPMMJb0J9Ufhc1dc+YiX6C
+Ej55514mjxFrJdumeRDwKqXy3Cmt+bCN5G+C2pGCbj3gHvx9zu14WQ8ZT8h5xECI
+ETaOlrpoU2YACKyWj3WHyqcJnTxZ7pd1B4AK9TI3JJCeKL1/piP6X2U9ScZSK2ML
+w/LR6BjPRnidomTdbMUJtuZ2Vy9f/A2PX8xz1VnJ1FwMsYZ04t7tL//jww==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-27.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..86c305c5
--- /dev/null
+++ b/swamid-1.0/nya-28.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_684a985dee85176568751d64fac68f63c00d9868" entityID="https://nya-28.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-28.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-28.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-28.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPzwtytwhm74MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTI1WhcNMjExMjEz
+MTQxNTI1WjAeMRwwGgYDVQQDExNueWEtMjgubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwn2PbbtfIZKer0xGKKXnMfnTiBWV66zT
+WLpu3nKINu0+txyMNYb906zCOAPfg05xRgyiyTRQ46fUjolTvv9qRYYyTgKj+Cro
+IEVKwMIr9QUHNj80q+1jFYODzSHYvgNevNt7qeX4NYEos1wFt0fuebTJKo8Kk29m
+6nCtkf458lC39YPx2XZXyQPwoVRSS329q+iF06lpSqmQjPTldZddOlzT6wXaXrbI
+U7HtMZ5IYI5ybijoc+ys7TasNvRSTHEeq2Lndk739nxiyiIsvZ5HB/Rxzz9QTIhU
+v+nyfD/xetu7//l9xOSNwHaUSLyIa7h6OY6Cw7sdW5KXXZ60zQxN8QIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjgubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+OC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBT34xaKadMSZngzCkfa
+Bd39b1D4KDANBgkqhkiG9w0BAQUFAAOCAQEAfNmRNfdHIOmZ8KcklShMyzLe+dOk
+leiR3TW1RxbsFXrWKlU7vCHwnhOllz9c0xGZoBMuXO7RMnwMCng2PcUfjNGrmk0r
+WFPMcaY5iW1Wa/NtTSxGpqGMJjb2q1rW49mLI2kzygvmg5v1kSkWiZJ43MLTAANN
+VQyXAkC0VL+iOe6std2STnDAQi5jvm4eJdmJuR+VhNaFtKtkgW2ikrp3fQVxhyvr
+Qiai6+3vTnVpY6vPb2GpmZ7Vg9i1p0h53YQTT3K19AcNoEERaWmyT2HkhbezB6Dk
+7LA8ePm+pfFNfBkR5dXSWJGnyG0aiLIK961zbmM5U7M9z4APEt+XTQVD+w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-28.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..6372507c
--- /dev/null
+++ b/swamid-1.0/nya-29.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_cf9a62f67c71f3555ff648abce24188059b88d64" entityID="https://nya-29.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-29.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-29.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-29.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPVtEU1D1aDuMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0yOS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTI4WhcNMjExMjEz
+MTQxNTI4WjAeMRwwGgYDVQQDExNueWEtMjkubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoMhpwlDO7FbL3HgiYqbmRJzIzP2o8Ch8
+Cnfe2HXDsXP1L10Od9XwIs0RVU85PNswyj9bB1+WQd1b5JSCOXwcj3VQ2yTPyxNy
+B/YJwytRi/HJvZYO5r2XHpi8Rt1+LQwwtcudBxMXBaHGupTwgh8Gt6HmMwBt2SB2
+ssm6Db1bi3qdERvceKY+nGS6d5BkJc3UxAf9tJCFWigW43C/+ceQQ27faK0CkC9v
+ZpBevJLRHzHrI+gv+qfIMW4rW73la97YvpagUrxVEScUputAEdwmfG/5Aifbo+Sl
+loPm13iyN1YP21JibNmLkaiaKoFj3tAb/CEXr6bcD7qB0XZTvjcEuwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMjkubGFkb2sudW11LnNlhiVodHRwczovL255YS0y
+OS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBTE4HuJOASJap2pMyBz
+Xib+WHoYlDANBgkqhkiG9w0BAQUFAAOCAQEAHcyvDfMN/UhcKt2r1jDs13L+e7I1
+aEfZrvAwzSi2UOK9Jg3kGO4moeha2MgdQ70kwMqMeoPYXz73TgrZLf30TVoovc32
+Fykdwb9wKJYQfR0UYgRWQOpSp0zYsCUFg9gD250+ZFZLrXANThfFUztMYO10weu/
+wvfGwE3pB39N1vS523kCuwUGe1+VyvMjw6kneE8zBmTiqq1nU9HxdBxBR3ts1i3T
+aOQdgfo/F5KcQt5ix1n/iOujO32UrgsCS/tXUp5zabjkAfkKzceQkBGFX1M71MTz
+l765hiZbT7NqcTuv5FWmDtQwLICRUb3aVwf3EQTMjrR4DiN6JqA6l/tEpg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-29.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..19c055e2
--- /dev/null
+++ b/swamid-1.0/nya-30.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_3d2c70078130ff404ce9f63fcc01f24660018d6f" entityID="https://nya-30.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-30.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-30.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-30.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPwDUuBKBZDvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTMyWhcNMjExMjEz
+MTQxNTMyWjAeMRwwGgYDVQQDExNueWEtMzAubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPEvC3RW9oHqfj1Y85u1k3rk0OK62Gad
+0dm6ZTsxJ7RNu3fnnjs1K6f1lYepncfS65t6X+h9d7pClkc/gEa+zoiNx2vqt3eX
+wPU0bYtAbvnaT7GO5NJBCXiKy5aWIRNqw0oCdxbEII9d7OXxzciChSTaGEN0aqY6
+xe8SxlzRwzuCVsG2mZcWGwgDYCOjnNpMiTq24X9xA8T55an/zUCQUaGIaAHcypnQ
+6bXgqgNaQj/Rjdx5Ujovm1PJn6NqeBLoz2VdLZXHZ5RC+/McoDH7UrE6REiXaIUj
+G+NEYD7eFAPy2DHLHQH7iFL6OKwlNBdS6cT7zZ2ZOSEG5qu+Bryu5wIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzAubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+MC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRmFnrhsZEWj2haep+a
+0AsWS0nEzDANBgkqhkiG9w0BAQUFAAOCAQEAPAQIu/4nJR5zNa+RC/9n/G5WyWs6
+76M5q5QUcSpITTFC/Zbnu5emoH4ePtiEHKJti16yFBty7K93zWagPhPEWQmmorg9
+MrlJ6uTUmuP/oRsrzXo90AWjV1x2BSI8R5Ug0ykSmPdhzbjaft9Vp+uYAjnrq39a
+zW4C2SOEz88i2AgLbCfKGbA2sBUOYdXmVlzUt6fhgA6SDSfZIYXM9ECOO48CqKOF
+6E5dv/3I+4J/mntCPEgMqThmYZ2vL3WNX1BDzGcXYSxQJpTNfwFALtOTc/u41NDA
++6uuDtJBuxsBAiiwBI5EHk6vHo4pIFEyOekcHpNLVBPFHDayxmSxHQ0RmQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-30.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..e28e667e
--- /dev/null
+++ b/swamid-1.0/nya-31.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b99f1ef37082f2e6991f9584a74632973905bb23" entityID="https://nya-31.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-31.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-31.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-31.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAOT44fHr8QzJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTM1WhcNMjExMjEz
+MTQxNTM1WjAeMRwwGgYDVQQDExNueWEtMzEubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzRyaME9gw8p1ZfmCFurW6H+zwU+AdIvF
+kVxLMhbgVbHgvhMY+RUIy0BPaQko9jbhqcqE4UVaKkaf30zB01LgBrj9x99caUDK
+wRtdEC3ryVFTR+umu+26PFdXM3S+sWjl13GmxydIlrGmUGdZcP8mAmEyCa71IdvX
+puaX6aSQkI9G22hRPEUpwUCV8hQo3m/yaH2fpf66kHbFikWoqprWTTcDx50tqN0T
+8EwpXzRt+xkWeCdgGL1pNgGKsOHBSwSE28r2kDKdhpzgy31UN9fkcRAlfRmw730X
+i2LIgxl2KNvJhE3MwsSP24Q0a6YAguTWe2DYLbQLVt2V/1CYucTeXQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzEubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+MS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQhYCoMNe8slK0YsHjt
+1FMDlP1GTDANBgkqhkiG9w0BAQUFAAOCAQEAQfIBJUOFHO1bsbvqLnjmN0JbeAqq
+fajalWObaE7tSo0wTJ6Kx5EOcI88Tj3st+bpHaMK2CbkeyKC9u/19tC3nvKnw3pf
+FZfdAVnfMf0QAP8X+aZVVgGBvNml+Ri3osgbpGP/uY4FMkKu+q3BnoWFlF4BYNYx
+CQH7v74f7xCdM1QSuN+4EOkDvIevfQ4+cZNj5Vr6QUJH0Xzv8rhnAe90ckm9hpld
+pyypYd04t3ZKJzjs3yF6CFmIhEFzDHNI9M3g9ropA5yRXVacFOcPRDkjuRyiMDqC
+bFjcNEEWynDyWSL+AUkSJqRpqU/2PU1bo2zj/jAY23UhpytGyKzLJ37EcA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-31.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..74b84329
--- /dev/null
+++ b/swamid-1.0/nya-32.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_fa26a384280cc7faf4e99670a69c376415a258cf" entityID="https://nya-32.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-32.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-32.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-32.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMYFTiBLfsi7MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMi5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTM5WhcNMjExMjEz
+MTQxNTM5WjAeMRwwGgYDVQQDExNueWEtMzIubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqI1QqtbNrfmkKJOQx/pjEH/sQI6dgPEC
+cgv9PCxSpLcOt2aJsGrlJtb0POLMvqUK5zElWsFiYN1eDUHsQb39dsTEXj3SKiOP
+WNwez4WkSIOXSFRqU2LdezfSPJAssErOZHkos6Ug9IGhCvS66xVSU+sX4t2zvWIO
+a1NivRNoFdOD3Y+Qoh0lpccT5jH1PycU2cG6enfNl7ldQLOhNczgmYjoWg+3BG4C
+sCJT8T7ngGK799i3fQJbvzBnVO2MdZ3SZzFLBAaX9Y+rwaje3HnFj4KVdXrtnCQY
+uBt5YE4L/hep1urzUALijMPCsHG+Hu2OqQYnbcuZu5bsiHtioEafZwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzIubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+Mi5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBQp2p1Hs71RPOvkrqO8
+tyAut+V8RDANBgkqhkiG9w0BAQUFAAOCAQEAi56rnjNM7fOey7YGbz3/kCVp1+Y0
+kjoWJn0k3dmrKbsSlZnG2OKkNQ81U4dRFSahWZcRiaVukO/yyWOloej23aYEIHNR
+vYpNt/NREqng2W4tE75Vfmzi44/beZoZdLbKawMXF14fvhdDDF3bRtuqVNZPk9j6
+gG0eguKksNMYTp6cQD/uD3EaHt3c3LV81oIlUp5D2nKUq/MvO9m2VSdNzrr85BRT
+ze6cZZC2EhE0JmqLOY7di4cTUHQlnWKUzt8CANCNJBUu+bi8rg8S691FNSNWE3x4
+ouqh4/BW89AV39CyWouTKL/oUDl8p4h3TjZ/doN4OaXUHRtAFKCp5gpkRg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-32.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..bcae00e6
--- /dev/null
+++ b/swamid-1.0/nya-33.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1e9a346c4120bdd55c17fe7ba76f0184a810608d" entityID="https://nya-33.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-33.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-33.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-33.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAMvj7bSCxnycMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zMy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQyWhcNMjExMjEz
+MTQxNTQyWjAeMRwwGgYDVQQDExNueWEtMzMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAryAnZrzl+BtyvaJOF9Rad9HVTOr9vBBk
+bbB/uqQ+JYs5TQqxr64C7Wc4zNNg49yfwYbOgmUU0OPUnk25D/Bvpf26VA+TlQkv
+cbJTFA905HmFfzvbb82drJgNRrQVm7c1RF+6sGrsOkSPAYL5FYsyLou5vCbuU1+V
+FOpsCyxzKLK0CCOCakpQUR1oDeCOS9TxDXs0wRPr1BDuwmHBGTNl4BDRRRIdQVqI
+ngcJC2sH02gEBQQFwL6TfdieKJtYmAECJ80Wo6J/pSlEe6kbBtayJYTnVzSKNTen
+bVrCVQi/4C7cQGUlbxIt2/SBvRC2s2mQGCLU19ec1BADkFUzHpIhBwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzMubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+My5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBRezzosA1iZ3KTBRd9j
+HjqwR19pQjANBgkqhkiG9w0BAQUFAAOCAQEAad3yzeNbWdbMVUTX7VcIrjSlLIB7
+sEvgoM4u9v0L6DKmW5grnbdzAEed3b3QCta55dsV9iNNyTUuBtP1phs2UxdvU0q2
+AH0wvJP+7iQgaMWRrqkBkWum8b05/d5mhfAvVS3FhwnefX2WlaA+kaGM6BHe+XZm
+6Fnutbx1YxXaS/YcVPbOwaByenvReO7513gUhW1QeU9eHOnVFPbhnneSKFX1FWa4
+sWpRSY9+5vK1iSol9uKYDjWMPixL3BQJHt6gOfvS820UCL71gCrylXCbEvnLx5G/
+lbJXNPGJ31Iti7u9Y6zus33GbsXQqcHvkP2ouf1QDroQYEyl+fwSjfpuuA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-33.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..9107778b
--- /dev/null
+++ b/swamid-1.0/nya-34.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_1a4e6dc900face17106e837c8c473ac660a27a16" entityID="https://nya-34.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-34.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-34.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-34.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAPEqYuWyQ8g1MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNC5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQ1WhcNMjExMjEz
+MTQxNTQ1WjAeMRwwGgYDVQQDExNueWEtMzQubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrNLM/FKIYTwkHrTEOjLqYlhhAJg7iWS
+7WTUFkh2nlhA4iDR4/GQw/yqAQWWotkI5S6dPCl4ZbVXth5j5vp6DubpGV58HRsO
+x1m9r3eKeHmK95TzyazgqbPawfUR1qe3hGVN1ad1J7tPR5T8/jBLWdxTrBZVMJZR
+LOiTSHfdz4KdODkqWqaeHyBxh3mulDpNf+ytllC9uyOV7qD+uBF9WViZnVqMh/B8
+ZOb74vRbvU8KOIVga9shbPUMegXot7IN1mhiuDVvmcYMc5PBTGe56M8toEn89z4n
+C1Llo8qafZA7g2lVPbAHyyNdZKoO/68khXlTm7z2Vs4mGNPV17hxvQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzQubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+NC5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBR+uscChvQauczeC0kP
+80XBK6OIujANBgkqhkiG9w0BAQUFAAOCAQEAFnMvN0jc+3pzoiKfUS8hj/2AY4F3
+Stsjp6xqzlLCjJLrvtyjmQrLny44xuEzVUA/ptSFUJpBgRUo2ZemTPTEW5ImIAO4
+lTnNuyTfsJ3WS7dB6mw6tRdEKW7ECVkFvMLtK+GrZ4yvF40kM/Lf7PHARqsE9/r2
+uONP8RNcPjPXlxGWaJr4ZGEE6Np6vK7t8SE9KmyAxqDuJsSYSttm/rnxCxyJd2+Q
+gAQFMTUAce/nzKsaiT7Ln4EUErD+pBWI+gZUjJGJY/5X8WeKdckgK/EcIcptunhn
+/46cgE8tJBka35/XLdrnS66LA18NejHHcK3hNCeOoNgTRd0bs0QmuYIBXg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-34.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..03711b3b
--- /dev/null
+++ b/swamid-1.0/nya-35.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_f4ae947a8bc6458604b95948d7e52672bba1fb5c" entityID="https://nya-35.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://nya-35.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>nya-35.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=nya-35.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAKs6KyONyI5kMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE255YS0zNS5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQxNTQ5WhcNMjExMjEz
+MTQxNTQ5WjAeMRwwGgYDVQQDExNueWEtMzUubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4zTWWdHMvvXnoCjftPRBBqc7ne7aIQuI
+rVbZMCC4Hupc7HXPv9YNcllFIt31x133Pl+pMkbCL8XPxJexsHpfb1L9kLElW4bL
++kZ6Xp6e3YehgF9D/bN0sL2sGPT5BOTAC5xPYk7fbAqk4VzEdIe8QgTfA6jNciBK
+tlvFVdcIeZA/1EfqymQW7xAIMPDWNgOkI8oFUDxDKyLWXEeNKgekqXRDj+L3qzOy
+ZSL9CQPzKGS5deDGBtjqch0VJx5KPhcPW5LZaEVCm/iSNdZi8+eAPtNhcHTdlCWl
+2dqmF0m1+O9hL6LmqPIK3jvlnzcwncXOIxbw0pgqgx1z8kNRWaQmjQIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNueWEtMzUubGFkb2sudW11LnNlhiVodHRwczovL255YS0z
+NS5sYWRvay51bXUuc2UvYXdzLXNwLWVuMB0GA1UdDgQWBBSddo1xVsPufJwusEPA
+HdADKq4ACTANBgkqhkiG9w0BAQUFAAOCAQEAoMVSME/FNjBVVz3QQaTGbQM9eYoS
+s9Uxyc1ida0uyeJlqEkKXkKFW/XlER/MLCphR+8aM2h658OJJIOlfJqh4Ptx1oIE
+EzYjDM0/ozpW0xkR2Gbeo5J8Eu2VEKMd+VnoauuxzpGOXMRdQJDAeYLG2mRC85bp
+22qiDmjUdX8OA9AFusHF+9oScu3fVwMozL6EfJwjWdv92rU/+5PohCg6hWE+aPou
+BPoT6aoz5sXDppS3v0/cyPjl7/DXtnSdxFXPrTTmCgqnuxEjQF2MPVcws0VpOs2S
+PC7LK44YcvEIRMBINj1NvlD4wCjEM+JwUTQ8Be8/OhQ+5zrA8qI391pkEQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-35.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..f7279a62
--- /dev/null
+++ b/swamid-1.0/wb11.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,52 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_27684230610bfe8bc2c1f0dcc5335638d45d8390" entityID="https://wb11.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://wb11.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>wb11.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=wb11.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIJAK/RKyYmPJldMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXdiMTEubGFkb2sudW11LnNlMB4XDTExMTIxNjE0MTM0NFoXDTIxMTIxMzE0
+MTM0NFowHDEaMBgGA1UEAxMRd2IxMS5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC5hvtEpXEl1hnktnuRBvjCTLIJGEH5poZax+Sk
+0eaPg0vF+qkJMcyzc7VRyilLI+d1goQiyPmeSMy/2Ltxh+qhc9ET7miwq9bHHNGT
+Ia/Jf3Ed76+4KDAJMVu07KwOLaC+NNccTfs5fn9d5Vy9HMncRxwlzUJkMFWk2lkk
+hWHlx9gPtBIYm3nr6xJATQWWua0B068ZBkQFSPYYfa65m2EaOv2vmR2HY2hOQIKi
+VLMfrft1/c54429mBopAHmfuFMWf9zgaR3As1zf+x3V2/3+/si95UniXrhPO80XT
+3MJCZaCJsaf4hGTU/+HrU5Uq5p7oADrUgqep61Zv1gFvcwhpAgMBAAGjZDBiMEEG
+A1UdEQQ6MDiCEXdiMTEubGFkb2sudW11LnNlhiNodHRwczovL3diMTEubGFkb2su
+dW11LnNlL2F3cy1zcC1lbjAdBgNVHQ4EFgQUtwpVF3ilNA06kTMB1MRiYUtxyOow
+DQYJKoZIhvcNAQEFBQADggEBAB/w0nCQQshFHo9NDFgVYl1QV2uPiNT0doPS3SK7
+xnjiVSNCax/o6F+KcFtBGDEsF9L3D0yJ0BcONZmN822k3tBBbZbpHNy0SMUEsHo8
+cJjWJKRpjX2xIrqhQVkvys13z+/ZaQDZ714i4Ix5hN1RvNNZB0f0UmslM6PaMqEu
+BEKjnO6kM3QEK6/n6G1i9Z0JWQrNGD/7Bw0SvwTWSrU5wbQ5jPn0opc7oj6pLdkr
++9HsDRob+BDYoXPUz563NnLhpRRdnN/ihIJ4cl1ZF1ANrUSYP8dXqtxY0gCz6BZl
+0xMs5JwXT17by5tZXmPKrHNqF8Qj03fnRoa2UnFh21KyJXE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wb11.ladok.umu.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml b/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..52baac11
--- /dev/null
+++ b/swamid-1.0/www-en.nyautb.its.umu.se-aws-sp-en.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_ee45db9c5f759d22c5a31ebd07324da0dce54932" entityID="https://www-en.nyautb.its.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www-en.nyautb.its.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>www-en.nyautb.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www-en.nyautb.its.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIJALu59e1deADVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHd3dy1lbi5ueWF1dGIuaXRzLnVtdS5zZTAeFw0xMTEyMTYxNDM4NDhaFw0y
+MTEyMTMxNDM4NDhaMCMxITAfBgNVBAMTGHd3dy1lbi5ueWF1dGIuaXRzLnVtdS5z
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8Yrglt4eeLRvVbTB9M
+pOgJIqJ513B0vwmoGHvlOTsKOnwx8anCEfDw1/lUW6W3CcSc68z4AkuJdxN1TK9k
+RzPxV7o1GfwTJlKNc8yDJBgMl2IuIoIhpApNa3wcd5Wokfcem6EiVCcQdIwc9qKD
+JYBXE/fc1akrRoj0oAei787p5b8sNSvIUh5UDFpSZMpHiwBB7Vjw9+019Di1XHvB
+qPbvKd/6AhQUzWyA+iwANYIiGthfuVtlEfBp4OVcir2P/JHf0bVu84yA4Z95iVnb
+/5/5Dc4THL/Jm/RJfqLqFkozBZZO7jg4gWXCGY3Qjx5QYnJuAysod1/qyX9yRniD
+fIECAwEAAaNyMHAwTwYDVR0RBEgwRoIYd3d3LWVuLm55YXV0Yi5pdHMudW11LnNl
+hipodHRwczovL3d3dy1lbi5ueWF1dGIuaXRzLnVtdS5zZS9hd3Mtc3AtZW4wHQYD
+VR0OBBYEFOgsgCRrKTKebJhZYO1bwFPupSuFMA0GCSqGSIb3DQEBBQUAA4IBAQBw
+2SY3k7yoFz/bkr+sIyUy4Fk+K518jSoeVJATzx91rvny1ocymRCd/dPeS7C6zTMo
+zPUHwxwql8gRygJ8O3V/0tAa2Fxdv9qNDRBNXzcarhS/cgsajq8mpWTetuOoX/sH
+nt+NuT6/w9dbRwS4jm2VeUPKMPNV/T9jEpm6haIBTAi0nRSX9CDk9ua6YQJnFnrY
+eDAbPLlLDWoLMfSFSZt57hqNGaOUvVkD+a7RotqaZ9ysHM8BpjvCEVKjpUE9TZ1T
+0fQxgfgbLgn1oG8hSELpCUwE5uFkC8A3c/aqEen6POsOBoMjQsVkiPQ+AZFYmBHg
+S72ZoHYu9zf1dW77BoUB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.nyautb.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml b/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
new file mode 100644
index 00000000..4003e937
--- /dev/null
+++ b/swamid-1.0/www-en.testc.ladok.umu.se-aws-sp-en.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_efc5aacb0919966a5d912cfea9b05d2c9e967c64" entityID="https://www-en.testc.ladok.umu.se/aws-sp-en">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www-en.testc.ladok.umu.se/aws-sp-en</ds:KeyName>
+        <ds:KeyName>www-en.testc.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www-en.testc.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIJAPD5gylxXTLsMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
+BAMTGXd3dy1lbi50ZXN0Yy5sYWRvay51bXUuc2UwHhcNMTExMjE2MTQzNzMyWhcN
+MjExMjEzMTQzNzMyWjAkMSIwIAYDVQQDExl3d3ctZW4udGVzdGMubGFkb2sudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR6ttyje2V8Jq90p
+j3DGKcpdB/xWrwNs9ZjznEXsFSek9KXEO1CbhI1JjxgnN7z+lcQKkdsHjZeyybTq
+/JuC4Yxy6W1SBmQpGLRF1VcHPIqtrYOIN+CKj6zUQ/8xcCb3EG7GWncwdbJz139q
+eabTljBOW0BBUMHQ5y4qCMb6ldNXMw4KNTt1ZNrJpQP7A+uYmv9rRDnkdSGzNACw
+/p8PTApQVJKmJU0Wl3zQPx1p+FuNIm+F6XIwsdo1hn5lqvX8sizMpxkEYvaD7EdY
+Mk7s/8AIgkpR52dr1R1he5OFH0nsuRLyyGDHDLVcWPD1yuqVMNcMikEDzB1ivFIZ
+ULTp3wIDAQABo3QwcjBRBgNVHREESjBIghl3d3ctZW4udGVzdGMubGFkb2sudW11
+LnNlhitodHRwczovL3d3dy1lbi50ZXN0Yy5sYWRvay51bXUuc2UvYXdzLXNwLWVu
+MB0GA1UdDgQWBBTxMWuvQbAhx/SFfNjjCcT0JjvFiDANBgkqhkiG9w0BAQUFAAOC
+AQEAmdk4A8kxlQo1RvwFjCR+fFxducI0RXlnrfcQ4Vn/aebpJ0/C4iYQj2+pECix
+RU5HICdi3UbrlYVsubVIcyJcIoHV6WjkFGh7pTFv4Crvganir3FizqwSPHxjnpNv
+dKXTs3Fr8ubKVuV26vzJA7abxdqm64XTMrM6RxxzxjbLqgdNi3Z62ZganPmEGC+V
+tEyRklU7ZzTJDYcIYMJE401ng6Aaf1UrGrw5PGUfaMwgEdxD3Eex04vPTCEDy1FG
+SJI215JaSmaI1Sg7jrIxL0wrIPxjRs3xQkFBinPqVWdkmSWtcjssi0vM8Iv4lb2Y
+E2gDCP4Dxhit8z81uTyc843g/g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-en.testc.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2011-12-19 09:21:04 +0100
committer	Leif Johansson <leifj@sunet.se>	2011-12-19 09:21:04 +0100
commit	ebd10760109e458f69b5186a7dd83bd9d566806a (patch)
tree	87ba064f8b1d32312742aacaf91cd009852de928 /swamid-1.0
parent	ddec17dba6b13c497c786ae10ea5b79e71c30fef (diff)