https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-1.0

53 files changed, 746 insertions, 785 deletions

diff --git a/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
index ce8cf1b9..c17965bf 100644
--- a/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
+++ b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
@@ -28,7 +28,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/POST"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Patologi-atlasser</md:ServiceName>
       <md:ServiceName xml:lang="en">Pathology Images</md:ServiceName>
diff --git a/swamid-interfederations-1.0/auth.asiaportal.info.xml b/swamid-interfederations-1.0/auth.asiaportal.info.xml
index 80264681..3a10fd81 100644
--- a/swamid-interfederations-1.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-1.0/auth.asiaportal.info.xml
@@ -28,7 +28,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">AsiaPortal – NIAS</md:ServiceName>
       <md:ServiceName xml:lang="en">AsiaPortal – NIAS</md:ServiceName>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
index 451c1171..9dc7ec6d 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Statens Museum for Kunst – SMK</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cHM6Ly9h
-ZGZzLnNtay5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
-DTI1MTIzMTIzNTk1OVowMjEwMC4GA1UEAwwnaHR0cHM6Ly9hZGZzLnNtay5kay9h
-ZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBzgpSB
-JQ9ntqiPmIo3mRCsdCauarGzVELvUMgZduJ8DXYfr4440MJKElv/r5pfb5aHMmdT
-Ez3IHhozzLLROtIdIEgNUxhvE2dB7hMLbyci8gOhD3K/mQ8Vn/nnHuPEU+XsbusZ
-olYvjanl30EyTvXaCTBrapK48xNLfcxJmdptKuLJOMrazs2KDYsvlgK6cD3D/l/1
-xJB1XMdCMPifzqJ1//pBtemKTk9/MwW89AA+QSKgMVHlbGg5xb2uxwbX4Wvr528T
-VtKg/2JGMXXsiFb2fDLv9Nv3gx1eJh8eMW2PO5yFqJCO7JjW/lnpXAv/HiDkzR/M
-iaCTH9LM7/F3Hd+I
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTEy
+MTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDExMjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH+ChYZ3xEsduYcR+jWs
+gix69vdUsmunySxFl9+6pZAfIP6wVbbkD7MDz+ng98FawsJ0CO5z/C1gGUKVL4UL
+FS5PEzhEIfwYdd33HezwikK2LqKznZC3tXt4XcScO/h6JepJaOrM52yXMZfJk4T0
+zKOuMQykLXOtEZfjl9uxbkPuuKqDQpQ80dMD2BySZXG5IKDk3WBCwdcFMoLIVFnV
+XNoNIRKX7EQdodrckEGh5tE3l1d5JYKzOJ3ofuOzCHTSDQU0XqUC5CL6lnKmX7dA
+1YCHpAyhK/xfv9TBT9o54CTZVTXUlWQSoTdS5U6KcBSb0sjNo0xPunwlMP7ZUMaC
+Kto=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
index ff5f6594..d1283d28 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Copenhagen School of Marine Engineering and Technology Management</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL2F1
-dGgubXNrLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
-MjUxMjMxMjM1OTU5WjAxMS8wLQYDVQQDDCZodHRwOi8vYXV0aC5tc2suZGsvYWRm
-cy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl
-0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOea
-lJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8
-Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQP
-gEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPja
-OgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEASUaHBtxa
-US3uTB3ULRH9GaZ/G418Tk1/0MMG/3KGDkI0boi7AFgr+t+/J2gmSd6nPpu5UCgd
-E4jpj1zX6+nU+xI/XQrRghCTqyakwG9JDzZsMDG78kLp4EBVfZbeJ/4vIm1i46Bx
-oDZPgIrNPa3NOCnsuRABVBf1obHzsy1pBNAVs4lRFoy/+cad9KYbHOLu4r0DteLA
-zUsbQupz63gLqkFj4t+lcOV743aWzX4Z0RVZ3JfqfqBW5weKbqShMmFBBLnxqBzc
-Y0vFLNNUbts2J7AXDQK28bn0u2mnK6aC2eFqEgcTU6xg+qQbj81PxKigfSJRsh+R
-5pHBv+YlEDNmzQ==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTEy
+NDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDExMjQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALEoZY4TyGSl6kjtZLoz
+omhgXa0Umo6qgvzR9oTZn79vpvqT7GsWmhYl0kXW0d3Uo3Zkz8rU/bJxqyH8Lhzq
+Ldq2Q4G7x2eoUyCJTqGJk8SteBhMLahu5tqYJOKhlmWU2F/0uItgBl/DjPiQ1ezJ
+6z07Uk/fud/QyNp691E5sV3/mACwTxilMTLOiKehJ5FvOK41R+kRGsy215ROw2Md
+TxM9n8DVUzJ1zRD06Xn/S/UZvTybWnSgujORI9l1hJCvosgVhXdglS8A0qEvjJGJ
+Sqc517+VdYdHBG7VmC6gJb0g9H9M52G5Qma+pRd2qrgORVOs7+aJbFDrmCXlR/dN
+/jo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
index 5d6fa598..cc1c49f0 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Copenhagen Business School</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc4CAQcwDQYJKoZIhvcNAQELBQAwOTE3MDUGA1UEAwwuaHR0cHM6Ly9j
-YXMuY2JzLmRrL3NhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0xNTAxMDEw
-MDAwMDBaFw0yNTEyMzEyMzU5NTlaMDkxNzA1BgNVBAMMLmh0dHBzOi8vY2FzLmNi
-cy5kay9zYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAAT0qOocn1guY58XBu4c5HlKuYT6ZMQbwCykSOPVArlcuY3ShS1w
-L/0ZKyzRXgT9wm4G+8h+w+ikJI8lxAgsP8PIoA2mrlL+JNOcybFhX6X+1nR3B9n0
-sDi+zbR90rmTW6LrjIlzYxocRs3CgOK+mF0v16WQT1qH50VzKAHnDL+kOUUm0oXh
-9fGXhvGXSmrbRjc3prTcHPJ3KLE2PFMErS4IXMqJcprDoKhT5xOZGlPqv+o4Gywe
-Cjj3WKu9uCIkm2kJ4nqqXBuxmWIoRc/Ela6EFqVumg6XkIrP2ILJgVjgNtNMA8Da
-Zd682vK8XDpmc0mzv5AP2Bncmy2W1upHBNE=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDI4
+NTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAyODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGgNKqAwyp5+bNtiktDM
+quMhBWQR+t5+fNcADGii0LVo4BtI2pYoldA3PuCd84C2U/G9ntwIezsenJJhreYM
+PLkFeXWvMVLnoyRYJboxOAQFBzW8TU3wBiJ4WMk9cdaTyVLdwG/giLnEZUNZH8mX
+96ux+kYBIvNOgKr2/1A29ix8Xpv8DqwLHnIx1SJ3f8Fg/uTLIqc+MWaZc7YqJgPf
+JKzCfj9j9fF8iKdU69h7L2oPQdgu2jKlYO5iLL063WrxxY0g+EiYIXzOdgxi4g73
+iDrD89hYvvMca78f87MgFYdl/q6OC6hsQqvew3c4KekfMbaNrOcRwb0UJtGluTCD
+Oz8=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
index 0670f822..b6fb5f56 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC9jCCAd4CAQcwDQYJKoZIhvcNAQELBQAwQTE/MD0GA1UEAww2aHR0cHM6Ly9k
-cmNtci5kazo2Njcvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4X
-DTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowQTE/MD0GA1UEAww2aHR0cHM6
-Ly9kcmNtci5kazo2Njcvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4D
-nhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA
-0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtA
-DlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1J
-Emkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnD
-EclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQ
-SQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQC2b3qzfMUuG5+RyVypQUag0x/PUXrz
-ecH6nJRSb2AMqoXoslQiBXBHkbXq1MlVWNOg0Crgx8fJdG1kvgUEFfmb0CS2A0ll
-9EFCYDiEVVIOSTWPd9tw2KoHtcFYD6qg76l4aUIwWYi6PSxzNl/k2X91ojmfD6kb
-if9zjIksILff5ZLTvgdb2iGCbE9xtyxqOXiVC1jN+hN9eMWLS4PjBIFz5ySr/Oen
-CvuGmD0S/S3+KaquC+DzJ3nP2LmYPyxQhBa99HDTUvoJRwr53FPiLhYveUElbhym
-NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTEy
+NTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDExMjUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMK+lp1hXsnarLHm8FsC
+TVLibb+tSOolQp8TVQIO0Bt4QYL7bGE5xvw+i914U0q2111tNatJlyeyONZtzZnL
+1D17GEmFJZ/cn8OhRGnF87a/e4lChizXw2a2RmpBhHZ/IysQFABsEYrFHd+0MA9z
+3eEaRgXgoG1ce27/p7/aylkRNA08h5vK7h8D8cpPM0DdoY7ZHL80KUrhs6Fa/+bC
+I0927JBT7OQ7wBfzjZUxuFZNoqTyVzUMpZm6y7+vZ9IM/FEXgnnH6t9Ci39gCRy5
+tEv/jLtAU3U7BawKf8CY91iHFLf7IOtWXhzbGsZg3cF1XTbypCwzy0SIiAh22odf
+jWA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
index a779e8aa..62bcde86 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">University of Copenhagen</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC4DCCAcgCAQcwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UEAwwraHR0cDovL2Zl
-ZGVyYXRpb24ua3UuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAw
-MDBaFw0yNTEyMzEyMzU5NTlaMDYxNDAyBgNVBAMMK2h0dHA6Ly9mZWRlcmF0aW9u
-Lmt1LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAEvxBAwGchmDrza6RWllwgsJ1l7CAINKJyWBDE6kIMPKPj7DI1T/lpiowC8/
-eCulHBgEIGW/bWSiNkYIaJrPuCIGigjl8UE7ZRmF5OxVr7/hY7slJD9qYLbNf9Hw
-klvYtmH0I5uyI5Fbo+wEHk1g98JUmXYiVX+bvsOHBA/c5C+55ZwqNKyXEXTN/8n2
-f3tX4Vm31Tn0Y6Rh2h42g6vKkAt70WsUlfSzIKWfBHo29GPQYbr/JOiKfJWbPJbb
-5qorAtuuCSoh5XXMU6qGcpPa9aSnfP5BNskgQWFj/8TmDp6fox9KKNwpBKpQLuHy
-oDZnFjBuo5Hw31Z+O4L9t4eVzBM=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDM0
+MDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAzNDAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADolls1SSQqaaFBcdwA+
+r7SLK6N9jPaC8/YsqS7QjHo4qACfsMhit1QHNXEEwteuD5P36YOaoxE4ZMCc8Nas
+TkEyveXnhXuuY/ek1kkpAXXj0NwWoSDf8Q1bwhLgI+yghOb/Bs/X9U6+dMNK049p
+q8ZuWiYwyudm6TU5942E6zJzW/QNLzX2BLslhO5HtNMucwsCn9P9ymmdGgM9hKuB
+Pzz/ymfWoBQp/FFRESOaPUmegLEFEKk3sbPkAMHO3NOEj04UtNVa5RA0DB+rTDlH
+dcbrKViWzuv27SZLZjoPeX8Pa4KVtiAWoUNsyCCRtwKNqGhcXyyCkgHuMea3ESK4
+iJw=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index cbe21323..c19ac290 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL2Zn
-LnVjc3lkLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
-MjUxMjMxMjM1OTU5WjAxMS8wLQYDVQQDDCZodHRwOi8vZmcudWNzeWQuZGsvYWRm
-cy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl
-0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOea
-lJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8
-Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQP
-gEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPja
-OgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAkHqEqEjr
-N4B3C4ve/P2hcPYWuZmKbmMq1lCUZ4hQFojUGrv9xWmYJ7EOm2XTRvZbCli7a2Wd
-dAyO3hIYTSZ+jF7Yd1AHWYT6962JbsL+Nh1gKEc6JteOaboxRLVCA7rpIP7B6Gv2
-nISW/fieSzMAhTUe6tPN1Z7W9g51KBsTorAk4aF/y2y2zaqaTZTdtuftRIFi19zZ
-e3YxKZTXpYQNXgjPi9OB0R/mpA2vq6h5c1sVH547Rn22N/Aa/Dywdb/q4Q9360dZ
-UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
-+rIdBFfSZxkAiQ==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTE0
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDExNDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALueNnNBnCHl1NlVjlC+
+JWIb6smtFBi3y56ETXiSETGmIo3K3usfn9O7gWf6abqmYyiohB6ndkhFYDJQq4MZ
+5mPuFK5h/mfRVwgXkq94qm62TqfKklAzt4MWsGPEyi3NzYIqTJpun8a2ZFPmbWqP
+HCMdtADLdqvqkDBgqxJPbcxYPNpTEie5F/8KiBwsFeZNDWBUfTUdHP4sCc3tDv5V
+PnH24EatAW1uLKBXYXBXWOc+fuE8AAMQCSnr0NAOeZOPuYh+6a5K5gM2K65UhbPR
+QhXzlQXQs9cs9df9avMxU814G2YHN3mTneJqz+v3nIwxOQJIXPluPXgJkmtxB6G0
+PQs=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
index 1650f1a5..28be2fb6 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Design School Kolding</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2Zz
-LmRza2QuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
-NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9mcy5kc2tkLmRrL2FkZnMv
-c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
-iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
-hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
-jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
-tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
-OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
-cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAi+Kah5zSB6
-KbsrjzAP15Lemsnnlfm01DTYdSnq0DvR8xtuZqg1OrU7jEQuD4aYAK8nyoLtPxmk
-6jPI6CCNAa/MvSgwxivD2hFR7ynKJrbI65DPP7Wo/6GRSr4vMD3xhKFNGS2061M1
-8majtXtIhwqhbEgmq5EAKeTQiUZM9GcJh86+r7Td9aJxiAa2jdn3UnTEfc5pDr71
-Wks1+XvQCZCvDytO08HrCK+2n42p5qVxKX2amKpWDuseBmpuTC9uTFbP2pJuJssN
-VOvL3ykvu7uuZW0/HdBtWE/eVi8dAKE/eV5SDo6p0QUF2GK2fT7a6Mlwl5tyYAoU
-dPcr9FHbXBQ=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTEw
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDExMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIo4HkPWQD4xmDx5R8bk
+rKKAmKXEi3OuQh0HSCoYBlRCHGTnShFR6o2vs8Fs3sMb6egtnM0k38Ksx3OXp1lz
+Czp2x4GSNhqzyr5D4qPtNniA3rcpn7R+VMyUPh7kqzSyWty1KkD13uRevOPnPEIG
+Ve5bdtHyrs5NKHcxiFfgwU7S0tNaJW9tDPmGvAURAk+RPbfi9C/G4c1CC81IlrEJ
+cGIH3FC8+9iFUT7uVXljmKxVvdi055G8Uw6U4tAX2Gb2eGaRjk/0YayuHF1BB5Mu
+EfJ9YROwV3ZlGoeGD5UBjew7vopOHJzGjhvBxUsEGoGFZ4fq3UznjfoTPpF+Iry1
+mDw=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
index 1958e584..54b3992d 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Fredericia Maskinmesterskole</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2lk
-cC5mbXMuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
-NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9pZHAuZm1zLmRrL2FkZnMv
-c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
-iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
-hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
-jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
-tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
-OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
-cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABFwoYZLSTvM
-Ox+xpZEIwo3/oTFGTIQEgj1smOQwLt1QJY9FM9vQSilMZameeli1lFJkH6sC3+fi
-BkgMx6Q1pJbZ2Eqc9tJ8+a9UzNRGyjEhppFgIQrf7j6zmxbAzqM/C9vCxAfWjkuf
-BheS19ZiEpN5G8F1KOrS/HWwZap+wjqJlXc+B8XM7NzA0V7M2nASYrss1XT/Ou28
-oit7gPbWJnh6sJUfd8z1iHOO3XCRxEOmef/Qnn4dlpnw8SKIBtsXW4Afxrr1moqC
-0O5l89J6D/tpFg8c0A+JDFmMvaQTq8H3+6YholNIj0PeeHwHVLgWuyQ4O1bfzw5C
-Kz+Iv2SAMUA=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTEw
+ODAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDExMDgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAI/NK8vC6qaAUPtlmGLT
+HsrMHi9Mo9jBcCh6+v6X2pEveBKybDpcRUrQIOgluSIph77KaP26wvZ2EgrJfVdi
+rrtuGbtn/Im2MKjKODJXxL6jR9poPRctQdaPZSpNMc6uD17bVWpn/lVOERlUJTXA
+M9YSeDqXj+RlWmUfYmQHhVklJZhdMOf1SNP92bMydh1cHhY/uELUHuzMbRMiyH93
+p8QiAc2yQ46OvmQok3Nluc/nITuYRcePew5tNvt9T0togX865LNNkFY9hDDjLN40
+PwwCEMTKRVFTdYu151rNKUR/Y2n3jVw7pJzcJDp1ixmYNphfKTkytAbEpeLaCTI7
+nPI=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
index b4bb839c..944d3b74 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">IT Department of the Ministry of Higher Education</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICsDCCAZgCAQcwDQYJKoZIhvcNAQELBQAwHjEcMBoGA1UEAwwTaHR0cHM6Ly9p
-ZHAudW1pdC5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMB4xHDAa
-BgNVBAMME2h0dHBzOi8vaWRwLnVtaXQuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAKkfFk8Zq0silkoNnU1PATnJH+ZBnzJRHcaT6F6hZD8AYgDJalYPYvdd+C+q
-/XKgOl4Zn3VRSUuZeCaPJiyR3KImAYX0LaRauSFebKcLUzmXlxapQdU0zpcUy5zc
-asB6hIhFlQp4E1/F7SzO8qnnyo0THxXn6fvDnJ6jGTWFCC+bUPD6587lp+cEX5qU
-/sEJQmLR6tyJ818FWyJu12HglFNELnKPzEzYpNtFNUd+Eu1cvjVxzOm0fblDVvf/
-/112CCqW22eyo2tDTAte06e/buaZf/dSK6TwEkwvjxVeqRFUKWOeA+dHMc/6Eazi
-Wma0d+CKLHPagLmm29t8EF37hZE=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDky
+MDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA5MjAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAN49H1jfFmT/xuXEQ5Mi
+IGz8fdatLXbsZLFuPuZtk7TCRyLLMe9Gjnk1dcE5Khx25gxikH05CwtmH5WJ1lnP
+xuDHoqAjBHkGdGNY5uSNgzyvFxhRsbnh8T44aIeX25lyhC1w0/MXK/KDrnD8D6h6
+xEdmqfM62OLGG1oN9HBkxO2w3d0VsxbOut4hMpjOkeplCBepUerquKNlKXy36ALl
+njaiSnE20fmXTGHOq1+KlQxJrMPLGHH72H3Qhay9db1P7o4A+Ii8F/2fFAUQUq6K
+TJKSWk5+ib4RaJBUb8RjsEFDqAeGk0kF9qvFiHf/rl4sfhIUgHOvYqSdte6lSruN
+aVE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
index 3d66a850..d25a07d8 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">Schools of Architecture, Design and Conservation</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9r
-YWRrLWlkcC53YXlmLmtiLmRrMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly9rYWRrLWlkcC53YXlmLmtiLmRrMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCmawXmJcTJjkSG2CWmf0cqhJ77eZ/VfL57f5OX
-BcSbYryjWX5Wd1Z/t+/+83h18d94xPiw7dbv+bMq7Rdrxi9dYhcDWRLzEJ53CczD
-QdmqJtvYjGCWhR4Ab0Nm3IOVLepSUH24e2pEiq9/4516miiIpcNIxlEnVOu7gEcF
-3uvY2iWCki7dFaN5gDYHWm9bNY341nzT7OnP02Ehi7Sg5oAUlKuo8rQurMNcthrd
-JehUn8MIZDD/v/obLp8TImJijyvEbcJdqVIXmdx8L5DPoP9vJlVeMtSai3ED6hsW
-rBue0WdqjxUhj4Yyw2JK3w2jM3vzSNu7HWJ8AIBKco5rG/vo
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDUw
+ODAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA1MDgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABbXh1yzmhi4M8CGtbGW
+BNDBPRPjdpf9q3sTMaNFpBCTgmiZaKctqOb6dTKTNmIcQz/s5BYweGskxW5nmaJx
+6L/8SbBPBoTmV6YndCVz4xl7dRJVefOnLFUTjiVzAHr4iXW0b8idhy7Kh2n8SPNb
+TCfZLQ8U0LqYzOkeCpeOPmOHRV499dd9YMtT/IG+8zaCexTf4rzZ7UirNUJ4pchD
+iLft1o396JSg2L8T4WJQY9W+Mz+ouLBONIqoQokRXSpyv7FlEDPh8R/dl6VCciWj
+alv2kvIapE9I9yqBda9noeq9nOXSstiDlU4R5tJe9uJtMGYdJUKIVLUvjSzS952b
+m74=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
index 16f3997d..c3c7da8f 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -20,24 +20,24 @@
         <mdui:DisplayName xml:lang="en">WAYF Orphanage</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICvDCCAaQCAQcwDQYJKoZIhvcNAQELBQAwJDEiMCAGA1UEAwwZaHR0cHM6Ly9v
-cnBoYW5hZ2Uud2F5Zi5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTla
-MCQxIjAgBgNVBAMMGWh0dHBzOi8vb3JwaGFuYWdlLndheWYuZGswggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe
-3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EU
-FS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS3
-6J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2
-qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL
-63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJ
-KoZIhvcNAQELBQADggEBABx+HHsDGyCHtfGNTudzmFRXilr0ay16wRgaLnsCTk3M
-HM2yOputyK+odkVdeIFQ+DnHvWcMOJDiXigiWbNVnN8qaFSHKCJ21Vj5peRpHY6a
-mtoI7FLHoi7t2w9+wmYW20Q4uEc75HrPkmbCn2wSAKDpZ9aBp7oS2KExU58DaLMn
-uxIsjo0ZuT1coH5F8+Pbz763uSbrA7S/c49K8/BZlFStp1419pB4FS+D8mX+ggeq
-Q2kElthI7N5bxzc5JrWQJJG8Vze/g3jvVr8m7p+FEpRjK22WPhfFtwislkYdDfUx
-I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAx
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALIvgphenZBKYCGOi40J
+Ctqz1UC7zuI/GH1uOwrXY5tHnKc/uE8fRm7NUkdYtQU3XkC+fPG+bF0RnFWJ0F2A
+HHVY4snPyr1DSGps89v8Cj9lmyBTasJVAoL9u46brMSUq4pD6F9IOdKSiXUQW6DF
+I3Yx4azr0R9rmURCdV/JHm2nguncAvToNZ7RwLrnFaEVrH6wXVIBu34vJklx0TA1
+0nWdo8ctBjLsJgmN42SlUzZ6AKd73K8QKEp5taHZ8wW7JxomWXzTKGcB22lY6TM8
+K+MNYa0FaHVoSTBwKkAYHS3yJZtnPXYNjqHrhpLJKpDvyLgVDOqGV2CNx8CkE+oE
+AjQ=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
index b9a090d5..80268e7b 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Pharmakon</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC5DCCAcwCAQcwDQYJKoZIhvcNAQELBQAwODE2MDQGA1UEAwwtaHR0cHM6Ly9z
-YW1sLnBoYXJtYWtvbi5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAw
-MDAwMFoXDTI1MTIzMTIzNTk1OVowODE2MDQGA1UEAwwtaHR0cHM6Ly9zYW1sLnBo
-YXJtYWtvbi5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlO
-a0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEg
-V9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8H
-abhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQk
-uv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3X
-avgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQB0m15bj3mKtEsAa2OuZDm3kNObF9EdWovAZX2UP2KL2DYiFTMq+ed0
-wcfWkL08mIbdQkqK4J50AGVY87tSZ6bWfHFYWUKsLjWtxq6Wv7gvLhrBbvPApVCf
-ThzKXtYoYmQodgfwdPob9NErnQyRYCXQqTl8P/LL8fz8wH4nLr8nbSc3pOXLtU7p
-WpB3i8Kk2E3xW/txsFNgFxz42w9sKpEZ4Ks3KKWAJqu8mOD7QdG7dHD53e8Mo2En
-GLUoaz+5wbTnNxn+ld3iVk9oeGqm4glPuaLwZ0p0bTt5uPFCjMLRc6+C45LWb6F1
-HM6p9FnQoiWszraaknJsQ8E+fjjqZ1dY
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDQ2
+NDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA0NjQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABa4iI6IooNCYfoQ0OfR
+cDTw0zxKxCU6Kw31BJNpA9o3mAqdWts5FuYIVpOZcx63G/oPnQydH23ieetYAr6B
+IPFjWpG8HJm/fvlPXdLrr20oMxJB+Kio2KPSL6dPkw9sAyk96/A5M0qVDFfUFqJH
+Lq9vHQEePUJbTuBLRxtoHBFEylyJcc9VAhJi+oJpD0bveeYqaBIFiyJpPFE/UDQc
+qpq2XCT6CVMauD6t51c9Uey61HiCYjxyTqw22W4oPxl3VdWXfgRWQtiIaFP6T5/a
+lxj1X/ThqzeUwPH5OZyN8zyjJccx+jhJC212XCFfvAmAuV3nEBNYkVVtuegQgozm
+E2E=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
index 473be87d..7612b790 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">EUC Nord</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICwjCCAaoCAQcwDQYJKoZIhvcNAQELBQAwJzElMCMGA1UEAwwcaHR0cDovL3Nh
-bWwuc3NvLmV1Y25vcmQubmV0LzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5
-NTlaMCcxJTAjBgNVBAMMHGh0dHA6Ly9zYW1sLnNzby5ldWNub3JkLm5ldC8wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBAALDh41qoio9JLRql4q1a9pVw+IiTdk7LFru
-+oTCPK1Hfcu4qKpc0o3yDS9jeHWzpAxWvJAayUoh5sccfn2FNX0wGa/fF6FvA8lP
-E1xYKG7qpBaarQeolhV7GNj5BEnoR3fVdm7u6ng5uzmCSBj28pnBVynBw/jtPHSi
-4nangh9CRECEFnOfdX4O9QScq8YLIGCAQ1H1+6ZFf3h42EQDRWHLr/3PlztuVyKh
-dAaPby0F3MFVntJKelaOerlosSI6uf4ap4+WUsp6iohDuW/QqTScWFxlCXeKXm6L
-t3FWDnyLxXBh+nay2r+6OQNF/HI0V54HHHXpFhvg3pAfZSmrhjI=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDcy
+OTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA3MjkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADVhUf8aVSUshFDOFmn4
+OrDjS3pRPlnKhgqS2XGkgzoM0d7Ci3uCCsV3/BKcINTqOGHIqAxtVAk8GVUihm+b
+Y2gFcWGNvrPvkJXPkLa+84tt4Pu7CG3EDX8nIxVeHLiAe11tbO8yVnf+yOSo027b
+tqNuCBB8jxrGDdJnsxNpRPaS9wPduywokyLLTwODDbca9tpyh/1bFxn65TEKtuyB
+8k7a8oV5DjmiNoq1xhNikgP95vA7nI8rZHHMJ31Gc4KO6QVcSoTD1J6FbDjffyId
+fYdo1rceED1MP+7+LQ3wHTvsYMYDdk5An3wCH0EgSJana0/zw93lcAr4BWs6FAs/
+LN4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
index 6370d023..9165529b 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Metropolitan University College</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
-YW1sLnNzbzMucGhtZXRyb3BvbC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1
-MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
-YW1sLnNzbzMucGhtZXRyb3BvbC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCEm91FrMlwAhNvPPdpWTTmC9oUf0chMAGjmSRA
-Zf0vS4gjL9j/4e/UDXmunoQCM3AwdPPQzhTIpGCwJChnUTVbdVMjsgUY4EU5MIoV
-KKQoMO/Hd1SzXKBM/X7sCjc3cJuYv5JkYvIagi8GCQuAimbTGRwx/yk6eOLu6re0
-3JlpWkBSsH//DVRVWnewwSRnLCAeYgMb5lTaiqGr3r6LQihU72syL7qIMcCT3oRC
-Gkaw1L25SyYkmmxuRX758zqv9SsxQRfFGnfmCLeixTIUGqzQ0vJerMlZyByA0vIb
-d3A0FABe5reA+KtzVrTieVTjWHGQtF2W1mNkWx2Gi1lGu25F
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDc1
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA3NTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAI6fQOdTCsVFWgccFOIr
+po0ZXTSOMSYzeEC5rA08ygRNaf88+luURDlTimoTyHGF9a8AK7h7Tt4jDVVoeEuR
+Y8ehfrOg9ngnKjgLMVmuyEt/9GxYe/xVZ4GAXLq4vIkZU5tkex6RRSGpkL12UHWr
+H3AnLlZzxKRdSdkI8Qifu32h2xoSCwyV/oTuiXvWfcI2pWjWmVxgEEdObGlRWkFR
+4Y1UtNkD5PHBdt/+9PlLMQ8ymMnQhUhvAsHs9Kd1v3cU/Qkst/oIa71qyk7n+R4x
+Nbi4B326s2yH1BZe2QOZUcQ21j4t3cyFWEnVKjLm/kibeUKdjockPwUff2gHCVHE
+jjM=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
index 7445b713..81524d1d 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">International Business Academy</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cDovL3Nz
-by5iYXN5ZC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
-DTI1MTIzMTIzNTk1OVowMjEwMC4GA1UEAwwnaHR0cDovL3Nzby5iYXN5ZC5kay9h
-ZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA2XXwl
-DO1ZW0pfyw3c5a6DAswHvWyTadziKIbu1udaLKYRgkFK6bK5xQw8fzQIyUvFdXOI
-KFnkkGHby4k3rQ4p/JvbjwDvKYGDOfhHbx71KX7wJebXKZdp6fWMgkoWVtimd0nh
-yPXrCZt6Q3y1cmCmnjMdRoWcVqQp4nU6c7RoO0i4d8EqkRt33M8L/F9cdNJHHUp+
-zNrZFpjq+t2fsk+X2klKZdHjETj38dq4hf7k9JRN/aRHWdj7TRgOn6Tpu4vRvBLR
-d7il/TmlRJpZCHPzgpx8gbIJwIruwlvCeGbKJnNsjbB08wG8Uw92fPIhTxQutgvt
-h8V01qfDTMmw4ASc
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTA0
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDEwNDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKw9hsMLQzna+ResyZVe
+FOUvymiryrop0NY1qL1HNrNcamUWNApGNTeuuHgWqt4Ssvxp7uMtk52Upj1MG1Dt
+GQT5zvh4Rm43ikcJMqDYJAqSuU3N6YP2SYToXjcMP/COMjoIi9cfU9l75yydAHEQ
+gLsbP+CH/XpNI7FUI7LwVHac31QmmSyfU3TIHhyoZKYJq731y8+FR0abxFQ3pKHL
+LeMRLRAxJR7G5DtBbr3uymrOZ0tV8qZ+7GKoxOipIsya4AaAWq1LsdpfF70IXO/P
+hcmxG9MKfXOYKTfvsT0xHKNO5VJnK1En10NZmqTAKe0YZRMFEMv39ORNZHWmmbDX
+UBE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
index 10d2faea..ca87589e 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
@@ -20,24 +20,24 @@
         <mdui:DisplayName xml:lang="en">Dronninglund Gymnasium</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICvDCCAaQCAQcwDQYJKoZIhvcNAQELBQAwJDEiMCAGA1UEAwwZaHR0cHM6Ly9z
-c28uZHJsdW5kLWd5bS5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTla
-MCQxIjAgBgNVBAMMGWh0dHBzOi8vc3NvLmRybHVuZC1neW0uZGswggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe
-3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EU
-FS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS3
-6J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2
-qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL
-63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJ
-KoZIhvcNAQELBQADggEBABI6CqfaeGkD9ZEThLVhz1xDROePkISDWNmCWRC/JO/7
-pAXIhROcfwlp0ho1rRyR0Ht7tHjF9XSJeYc/6Thjmb2+mHs+GGXE/UCy8UII5yCO
-4X9R2WmXJF/MnvtzVsbZBKRhecM8eU8DegLsAVRzpqH9rX5gU/95fzqaeIBooUI6
-xdBAJxDsSSmRcC/jkrhS66QQtIhSmZ+EYUnhm71M51ZMdYcgsyvQONim98pu4HeY
-b2DaH5x1TnIxj72njvux6liMHpwA2dhI5rp8jPGwDjc4mA8D2gRi7YrPLKj3XZ7z
-dQDb0gK1ALtFHsR6o+DkLOvLyImsQq8zCLwhzROY4ig=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAy
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMjIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFS7kjWA4qGbmLDWmXWA
+cy7Cl1+Jwfh+zorsm1I0BZytW9HekQV4d/oW/JJV8Wy51ifs4iUtApkb1/JJ/K3b
+Fz+PpC3VvI14kshNMI7OYeIS37kK2ampKqGL3sKTFQuIVmSdb3pLeTs6R1Zzmvlb
+ghhvPF2E1GZ1Qg770w44MuqxWoOVqNtUkDlRDizecaFS8vvhXR/ImDF3Nuo2x2Gv
+2s2eydD15ayZKujQcV9uQ5ZliKDrMhTedN2TflztxSIsXb8YDtcRS23pKBNbYowL
+UzEIZ25588PoUU9DNRD+5Kwdw2JXSfDykaNOK7aE4gJscxaXo/AyAz24Y4rsUdHL
+p2w=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -51,6 +51,6 @@ dQDb0gK1ALtFHsR6o+DkLOvLyImsQq8zCLwhzROY4ig=
     <md:OrganizationDisplayName xml:lang="da">Dronninglund Gymnasium</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Dronninglund Gymnasium</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="da">http://www.dronninglundgymnasium.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dronninglundgymnasium.dk/International_Contacts.asp</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dronninglundgymnasium.dk/welcome/</md:OrganizationURL>
   </md:Organization>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
index 443b1b22..74d6ca89 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Lillebaelt Academy of Professional Higher Education</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL3Nz
-by5lYWwuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
-NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9zc28uZWFsLmRrL2FkZnMv
-c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
-iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
-hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
-jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
-tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
-OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
-cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMdusBguY7oj
-RGfICyh1nEbsQvYEl2szEfEVAp0RGllT5w6dDZyf75R6oYcz6LIctV1qW2GIxFBO
-ma5cl2bzbknNPvrz5855RqfHwqYrfQ4SXQFJU2LsE1n/dUu+ylv5p+xFxFNuH2kb
-EojU1Iyr2cG3R4BRw9aEaIAui/eX8ii/uF1sCiHIR/grPvCQNqzTkPmhdxrMKQGw
-CeVgJ4FmQj6/WPgDvARGFKywOPzNrjlXr2Y05qFIp4DDi935RwgpNFduzvqpEpju
-Eu1fSRqLZB/574M1oGYCBu/KVHHsLmed3SZdUb9a2swxF7RZ8icagoS9efUn/FTf
-uVff9vzTPfw=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDU1
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA1NTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACf3YCU2eWVQvsT84+Ph
+eyyit2ttjD+dDSRaxbMflaxTxnejNJ5CSOxeMXnaT/47WIef2XkewG7DJTPoSh1W
+2X2L5uZCdx1dYiO+oIxLvmyx321ePkS0hlU0EHuqD76E3ipMFverudRssRKa9/gc
+GkVSWWO042dgDoBoPNMXCcqvGUx5nJpIOMP+uHK/BAsD8s7JWkXIp6QshAqrCzgd
+RwGHuKKRQYEIoIdsHwyWD7nQxO0x/UEiAkD3mIrDeV1CIrQPAJN7TtZoRwmbgaT6
+g1Qs1CQBVRFtf3z6vBIlwcXOv9q17Yf6gA2CqPIlBWUahIcSV8Q4hB0DxYMN1qFI
+5Os=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
index 3c226922..4c044071 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Copenhagen Hospitality College</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL3Nz
-by5ocnMuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
-NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9zc28uaHJzLmRrL2FkZnMv
-c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
-iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
-hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
-jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
-tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
-OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
-cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKEeFZyhJPo7
-YHgXgmb2ZmJOv6W37gxrAuuWVbyhcOzYSAtqA8zv3EkwuK5rGJpbdwVeNot+YJ9B
-TdqVLOLMSc6/JxdHtezW+M8nMEwMOLWkkyNA5/RC7w0XBvCfpPByuV8Mke60GtFn
-VOigg/8wKAyFIsEpzSPv7VMF4/SA/tYTkrGJtw9pYu0A54JWb4s0m5C87Y+16MHV
-FaA1fbcQnYioyAz0FRkxfvmMRiNPINA1jOrC7h/iRq0nGxHEnOMRNKT2h9upRgul
-H8vDIZSNJeoj/SitEpgjanw5oNXtqn16gZcB2v/fPs2qDbs636amU6ELoV0gpQjv
-247KqYnMNlQ=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDU2
+MDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA1NjAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJOSXwuspbL/pYCINSda
++xHsOxjmBwJoxuyLvGy0E9rh3yFlWSPnD/pxtyfVYDemDjtdAOlMIlpCcd6Xdtjl
+3Faz4hXMuCJrC6JNtrhKcfe3xXSgtAKT5vlJOwCp0l5vjMpozBaNq/0yUNQ0RrhN
+e37oNVWDeHNZV5sRuYGVU9T5fsu0eumA600RlUY8k/CFytSX9sgSFtP2nshwDBWL
+GctSiJfo1R1xw9DtB0CwjHSopIqsnIeLxwu2lU+rBWWiuC5TzU3ARP0nUKXHcKzJ
+wxB+XRmqBu1SaGuRSCk1ZP2hP0TbD00IHc5LRIx5Ib1Ejx3FEO8MweJeyeF75peV
+STc=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
index 41412069..3266e16d 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
@@ -20,24 +20,24 @@
         <mdui:DisplayName xml:lang="en">University of Southern Denmark</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICuDCCAaACAQcwDQYJKoZIhvcNAQELBQAwIjEgMB4GA1UEAwwXaHR0cHM6Ly9z
-c28uc2R1LmRrL3dheWYwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjAi
-MSAwHgYDVQQDDBdodHRwczovL3Nzby5zZHUuZGsvd2F5ZjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx
-6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/
-7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7
-DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2Zh
-HAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2u
-Mhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEACS/KoQ5/zG5slfeumGF7VD/qNY1Chhl2yrqabVx0GGTsZz/C
-eadVX++yblAqpTIoJqONPBbQbkHjrJoldBBS/xZwjHf/cxUY3v+91AJcUUSIcuD8
-7CClgaQzqciyXNsUhChN8ifiCsIkYHXrChEeCIHdsRn/Iga2cFryanhxCOVIeuli
-IWHwuRYZUHvlSUPGe+e5N+RFmuG27Onic1758ckWx9Z6v4Vdtk1JY/8zQRBsDpwR
-uLPggQhaFN4l/GFI0a8wKQd7xvvyFjpUVbDkFXyVHdOBJwmaL5djSlybfS1JP293
-jZehS9P/tKKffrsqCxpzGtwrXTEfxfMsmYVKeQ==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAy
+NTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMjUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKm/3IGDfYAEdCDbpECp
+9V1jz/FyxRNLxIcSpycKQgQATrYTkwCMaQcRBu6Whz3vO4+CP4zZxOBoTktfscr8
+dnT8Uxazhvtw9xnefnK+N1VzoSRFGRyFuqbxElxW6jjdSvZMDBte30/PPQc+fT9l
+NLx1miJaxM/Lm/De6Enw6ZajTrLRl83XbiKybev/FuADGo6EFiLfTgcSEiygWKiy
+7ziVrR3oAIIVaQUs8c9zNVGRZuoqQDwhHY2QbFieJhbfXsa1xXf2xPBglY5RL3C9
+HMlYgcb9ZbjJiGZuAuh6y9koXpRaVUQy4lHBWdUTMd5GVSublUvphhphWTrU/mSd
+uv4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
index 0d17052a..01bb9341 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">University College Lillebaelt</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly9z
-c28udWNsLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
-NTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMD8xPTA7BgNVBAMMNGh0dHBzOi8v
-c3NvLnVjbC5kay9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBAJhnVL0olEaPJc93+FOvclL3/flvN52duH4E
-4ZGywIIyby7CxYc4L7O0YafDCztji2UZDawUwSve/NeaJH+pQF5Eu+a6xZ3shp6W
-NYnuclaMiLZyl2s6sbs/F/6pztt/zY+5bmR2gLFtAU28zvrx+/FS8DNU9tys6BnE
-IYO56x+WDLRRkIt+YuqOR29i5lF/aL1G9shJSPHJ1fMtxkHfU/9FGTc0HAGzVvUQ
-uZJ5q8OhIN1jFsxF2xY8T+xaHvObuZJ9246bmlRQrtx7fAkCtyfCN9zPu0STf68+
-0jrwd+dleaSWvNjTrV33Xq1pYZWEM3MnPOKuvaSBz27vUft0nAI=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAx
+MzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAH66nzlzA4qd4X9LwfzB
+KEpmEgtdyutd0MkHBP22BbAiAfv3T9I+iG2gj6RcOcSRdEEHtSObeAw4rFtxz0VI
+L8QXRvvNDbYSRBlAB94CVdqGhaKH0eGd9AxVsOGea0WHD/yIxwSadc4xoMVfD0nW
+8vFcsu9MmtTX86tB+rH/J4a532oQg/rQdDjfNE+RTaDk1PH4aX7YSatcrm3yPKVf
+jXCuUeBDj2y0VKCIZgmQAI/8dlXyX7lZ5CeJueh/2u05peS8ozTza80Io6eEGzlg
++tPu7LH8ye06qvaWUwdIiajfMwVo/rSzzpdk8oL9RK38pywPPIkxfXqziExHGDCW
+W3E=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
index 57bace1a..3f84d6a0 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">University College Zealand</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9z
-c28udWNzai5kazo0NDMvaWRwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly9zc28udWNzai5kazo0NDMvaWRwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAUi0p8JyqivUpFfLdlC7DAs632iyAuaDDhB6EH
-Nk4x0NuC3momEkYPGt8cWq/+GvarQgkTKJLyDKEvnrRLi825W7QqgNHhvIcm3Kr9
-5p9wEUnQguVHD0Q+xrNNECB6cPZQ/I9tv2wnZkOvrLBrwbGvHLo+Gb5X7ThT2UFU
-S3/Subgs17TezQcYm9VW7e0nZrFaz7iXFgVkpMmGh3/evEC0t/bcCVg67jvYNQPB
-6pnMkUCIbsEJEu71NA31H6qLyP+C5TLNACH3tszaQiQAgNoVJN7nbaqokdSyPOS+
-TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDE1
+MTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAxNTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAriKnhyBV1I1nzzmUxg
+jVED9ZP8xRgQIlh5uoCqUHaT1GIbuHljt004jEyUswjAUlKMdRo7rSmnAJdrha79
+yIgfm/6p/EWQue3w1aqzcfKPR1aabijrXDKAZd7edfOONj8SPvDDOjzA7MbMedmV
+HPh63/25PoLYkSJo3RZS3RMK8hsR8rhyGTfmYf7/VIrGJ8sTtdH0nWM7hJ7fp9pU
+RWBMSLDMl5f2RETkyOf0hJLDvo8wBASdBgYZONoCfD6UXTUhtHU3mBh3ZpjmDDWp
+j4h1SRlpDOQ5Vky7a45XsAfPzEmu7gCHtn4B+0Wm3d5tu643Cn7aOf/GljPOBpO/
+51I=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
index 3f2186e3..b8ff00ac 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">State and University Library</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC7jCCAdYCAQcwDQYJKoZIhvcNAQELBQAwPTE7MDkGA1UEAwwyaHR0cDovL3N0
-cy5zdGF0c2JpYmxpb3Rla2V0LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUw
-MTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjA9MTswOQYDVQQDDDJodHRwOi8vc3Rz
-LnN0YXRzYmlibGlvdGVrZXQuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1
-Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f
-4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqq
-RLfonvr7DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLT
-UPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZd
-Csvrcq2uMhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAlfi/VceCvi+u/tiaZn3se2XtRmoG3YoPQtwTMPPm
-uwRGxzxZAoRMpFbYOL1I06LRaYQM8tqGtX0sNw+z1RSV0oX5NxDs0yxSmvuUqJy+
-6Uqi6sonAmhayTD6ndNc+O2TCgZAKN8AyHPidY/1Th1T8vM4XuvRHT1kiyoQztn4
-71Qr47kSditvTCGawFd2Q3uGUVHf/w7mKHmnSpdhew3LtbDhbIw84KJwYUaPwpcW
-u9xaC+EdRNA3uXhqdF1fUEvW6mJTef2ykcBErEgLgtTTbAM6KuKrdInkJp/XCdbE
-b45SXMc+awoz7kMadUeuovVtd6ETEsnnNquJ7navnN/e7w==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTA3
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDEwNzcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJQlftoIWQSUKU5z/dow
+3fdIBs4DhZz3k+z1YylMh6TquvG1LOZsmtJdQ/CcyJTH8a5sfPeYqIvo/pBG3ND+
+kjIxeWVC+AHQacW5UPdLf/AUai9rTrm4WQ6Ku8j4miAexpb9m857m6QvcslId/U3
+/EIqSXIpuHhKeCGr/NNbk9bBTHlIMPBXBIaHa0c6gEufQsTi7yoTSxxjWZK+F7DS
+IJGJxPolKEuIb4r/Kk3NWI8QTVethcWkzuA7tRrgbzvLK9HV+yn+ldCu86v3fpdS
+1T53UTkM6WUWXWuWA1/pRQbsk685Et1XXZSZrTNlgQlTkdDzFQow3XuFitP8GNTE
+TQg=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
index 2d0f4147..9633d204 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Aarhus School of Marine and Technical Engineering</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC9jCCAd4CAQcwDQYJKoZIhvcNAQELBQAwQTE/MD0GA1UEAww2aHR0cHM6Ly93
-YXlmLmFhbXMuZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4X
-DTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowQTE/MD0GA1UEAww2aHR0cHM6
-Ly93YXlmLmFhbXMuZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4D
-nhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA
-0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtA
-DlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1J
-Emkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnD
-EclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQ
-SQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAil2QnUmBwaz7KiQ5tsJkYjlirObMb
-STXByWsBbi97KpEJ6gubtbCAlEIBXHXZAToD0UKO9Xa+hsea7eueYW056riZq2n4
-HmKkOB+JvruqTrUp7+cmtGfTgIfr+dz4YrlSTeFsGvtD3112xa5CBMqQwzUi6Qwe
-FReoiwel15f1uhAqesNqCZRNG6S1yu9r5GhdljqgWmd5h5IpSh744scr9ZzZYspf
-wHyqhe9hre8z70TSKJP2YnfedEEDZ0ZrFIbzeJo3Jscm8Z3Lv99QF0UXcXGJyte+
-y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTA5
+NjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDEwOTYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC3RxxJ4jg8Jx8yFRrVh
+VD+udHVvDN1L/ofek8vrkdtipvMf8Mc1/JlmUA6FkdkU+FsVHBFI/QMNq0VaOyME
+U+T5MWH5tJ1HqQwd5ADmR61ETsnMNK3goHtHN17iF0kP3+NPWRHHsVY74/5y+JVv
+vIPtlNGpLqsMlNo0PbnHnoChjlnsFJXaYs0PMnXOI0kK3bDBoRyS25CP8vrAFlKz
+vsHxyOuaSb6TGISru+lRlNSMaPbmHocn2lyHA3mOaAGag85fwo1gDBYNPv+F2fy+
+4zGpJV9sDAzutXIi9RrfwkJYqka5J/dzpycLmqlxdvF7B3zCpGrd22VEHNTA83z9
+5xI=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
index 5810384d..8e36c76b 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
@@ -20,24 +20,24 @@
         <mdui:DisplayName xml:lang="en">Aalborg University</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICsDCCAZgCAQcwDQYJKoZIhvcNAQELBQAwHjEcMBoGA1UEAwwTaHR0cHM6Ly93
-YXlmLmFhdS5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMB4xHDAa
-BgNVBAMME2h0dHBzOi8vd2F5Zi5hYXUuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAEurW2Zf6aCXWNDIV04ht39P4MlhI8ut1QL0TPoAjUKlTk9ybvxQcN1XkOVQ
-ZYXsyhHWjWhmpBpZS7KaAbJzhBUCMpwAdsDOxLsF7+VZo3BPVGnH2lKSHPCDCGex
-++rithjuctIdtKqlK5/82/xb7/eftgZycF+slf3cFosOAAYb3oprtWVEx0KUmEq8
-B2TSJQMdX/r6TW7h69X94MOXA8ad4Ukgo0rnhZhbcUtURQeI51RFtfVGWu1g9ZDd
-x/eM6He+xeVltiNDy7VLsdrvA4KVYDZpR5ZOzDL6pE5u+yb3Wg8rgUOoZUcPVB47
-YNCobCjLM8GtgKPZGSBhP+avu6w=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAx
+NDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKiae6Ky5Lbb+51QYDyl
+64d7DwmFtZ9YXEdykIhfqGgazXAC+r4zbrfI/u3LfgASWouGXJ236mGtH4PSn+Vu
+MVry/EGMEfFzmzguiW7Zogr38yEsREhJRTleZSWsxRyGveScOutAd867Ud2gsmzd
+Jq8WYKiyMbGQbZWpcdKud3MuaD1fTPiLQMKf8SLvO8qUP7UiMsE0/jH2Qg85wdoK
+cvS2Cx0hYmGwoFYPGQeyQko64JIGQcZKwsR3E6L5MdmHdkmYmDrcj9aL2buoppge
+sZBjQ4/k7QtdVFIZcCzne26bhKh86al31lZbpKXW4+naIxdUTg7bTaErQ+3i1KGw
+MWo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
index 3c456bf0..cd331408 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Technical University of Denmark</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc4CAQcwDQYJKoZIhvcNAQELBQAwOTE3MDUGA1UEAwwuaHR0cHM6Ly93
-YXlmLmFpdC5kdHUuZGsvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0xNTAxMDEw
-MDAwMDBaFw0yNTEyMzEyMzU5NTlaMDkxNzA1BgNVBAMMLmh0dHBzOi8vd2F5Zi5h
-aXQuZHR1LmRrL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
-CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
-sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
-rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
-pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
-Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
-AQELBQADggEBAFLiQoHCoNhKCkBY6mFKLePGqnubEwiHRvnAFwDTbzhM1l1m5ZUW
-iHF23a7Rcg1KHVp4LQ3OgbeH5FVssEBRHyINDlFrdTHozYtzeDkTZgi7/Cg24wqQ
-BnVtITujEJatVPNyfYN2ID8DMVNB+7x7iRpRbusj05UGcguFvkRPF/s9OhKkEHuY
-CmpPNruZm9ubkqkJ/8jRLuL4oCxQ0O7INGbNn3tKhka0ekEeuj6qfod0D5zJvTSL
-3v6mMX8MkShdTtY7SLyT90nN6t/4cW7tvi9HVhBOFr/N+vBQkm58rCWcV/+nw2OV
-yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDUy
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA1MjcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFNWFn+7w3R5ze2z+5cz
+KlIUvpNJti7UrPI0x4MkN/CLwsqzcM+VLBT4rv5i43RoX3BnePoO+VEa825RZji+
+Y/1LluE5VQzFdmqV4cbsF8T0Npk+wW+8QSe9vketEoE2sst6+Ixw+PRW2IXwUTQE
+D2Z0thU8So5mW7IavM3v8A6BFFUHMmvk6l6JrPtVdizTxZnKudWp+LoYxHg+nz/W
+Dp8W1KwQsOse7wfnrCBNg6utIbqdHd8jFA6IBAJ1vRFEImscbZMoQtkrJy4Xb9KL
+LSvN2MtCU+NbpA+IYihc8liWyM3Z0jBnoUVjN5EV6ioyaeBW254rQYK7taMcqEfS
+H/0=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
index 481d49d5..9cdf7ea4 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
@@ -18,26 +18,24 @@
         <mdui:DisplayName xml:lang="en">Business Academy Aarhus</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDEDCCAfgCAQcwDQYJKoZIhvcNAQELBQAwTjFMMEoGA1UEAwxDaHR0cHM6Ly93
-YXlmLmFrYWRlbWlhYXJodXMuZGsvc2ltcGxlc2FtbC1lYWEvc2FtbDIvaWRwL21l
-dGFkYXRhLnBocDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaME4xTDBK
-BgNVBAMMQ2h0dHBzOi8vd2F5Zi5ha2FkZW1pYWFyaHVzLmRrL3NpbXBsZXNhbWwt
-ZWFhL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBALNRxgXj157kbsaXgCJAJiLeEujm+f4ISKt4/s9CGHANaKOjH4ZnjABS2/cb
-eLDxUGByE6g5RrX1LoF9etchQkeqX5tZPAiM0CEpYWKsmzDQ9d/EMKQl15mi8m3A
-tefAOT55SYuQwcznxF+Q4AYuaoePuaZk9snq/H1n718pNe6iCg6Big9+nB3vGvyV
-VO3JXZA/IjUtIWaBxX0wR6vfbblwKV6ogh76RKUckf40KeLLl2vMSuW/hEL6lN4Q
-DdbjKB6UO7mTuqPKUxkGG2oviO3YApEyi1jggBDOeblg450UyjsTJcivVg2prmgB
-5GuMfc4nu4mQairTeApR3+mF2SA=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDQ3
+NjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA0NzYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFZpxQZZzfMOPcqFF3u3
+RnqyCOYIPrecSNiM5b0C98aAU3Gy1hkBAkglnkal6jLNyK5ghfEdFWQUM2sXJzn1
+vV9VxhHVIcPs0AU5wOATEMirIukR4mVbmSIvl6IG2qfMKEDyc2UqIYsC3gUH98EC
+OYIq1TpEwIxVLjTsIUtFEPwk+UUA+0qwLjlBkIPcan4wv4wrIBkTMBxbT2WXh5j9
+o3q0yUnZbzKF5GQTwOdF0ma+wCUSdxPIg9AuxtYGzHpqlUTOecezu2NClwQ1+kBp
+rygEsdbHJZp4kc2dmC760+trs/rWJh/bGDlT/7Cwkq1Ca3HSPuJF0M+O8lzi9wac
+1Kk=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.au.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
index 8b08f095..8a98c077 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">Aarhus University</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICrjCCAZYCAQcwDQYJKoZIhvcNAQELBQAwHTEbMBkGA1UEAwwSaHR0cHM6Ly93
-YXlmLmF1LmRrMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowHTEbMBkG
-A1UEAwwSaHR0cHM6Ly93YXlmLmF1LmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQAVvkoFXRRj041T+0zfuek1vnNigD7AHUSXc9HX9HMS60IvaaSDFm5xZAfa09lm
-tJjC70nDZuUf9LGaX4a9ktzPRa6ri/r7mOMvEixTthJDHfh8sMepy44GFDyfC2u+
-O91Mg06oSGVoP935Pq2SU0BR9LuAmMVfi8t+JDHFq4DCgr7GmAV1YV0WcEIsc+YT
-eA1YVSbbMHCIPAFOqX/ZaVvxwX38qbqwTEw8Pi+/D4/ZrpzWZH8rPpi0IjzdBUKd
-DUHV11GiFGG/Plav7r68E1e+WI0jwsFx2ktk82hPuiix9HNFqmcfNmJA6wxfw7Ow
-waSgkcygO9PTBU5lKpmYMlUx
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDYx
+MDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA2MTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEMx8ZJ7QJ/XO5lM0+3x
+9vgnH7n2l6mQkRxjlry/yv7J+Q+hQw4yCOG4Izmvx2IG1NuU/KuClHT4y9UbSgqG
+s1NHbgUJ46OepdVrweTYcoJkF8p0dA56N5GSeqL1wqRVd9/15EwCQhmdsWds8hgt
+E7beXNep7bYs9SWGYkaoq4YmkDTbHZlyoXkS4qAOAoOYiOiG7NyQh09uU6Rmubrr
+r1uyjcq6NslsV+8fdMM+pXLUx668NzEp+AjvdZoMI5u94bFCVV7ZrfOnAtCEbDmF
+sJv4yTW5Sw8gIl25JEnij2n/r/PnTis3oKNf+dUGP2THTTM74hZVB52csZbLl5+O
+S7w=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index 8cf05bea..310aeca1 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -18,26 +18,24 @@
         <mdui:DisplayName xml:lang="en">Frederikshavn upper secondary school and HF-Course</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDAjCCAeoCAQcwDQYJKoZIhvcNAQELBQAwRzFFMEMGA1UEAww8aHR0cHM6Ly93
-YXlmLmZyaGF2bi1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEu
-cGhwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowRzFFMEMGA1UEAww8
-aHR0cHM6Ly93YXlmLmZyaGF2bi1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAv
-bWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gM
-CmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz
-17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6e
-x2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVw
-DvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmV
-Wr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu
-9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDEe2XDhPjDzgE9
-zLsGWFD/ZnxJRzVrAJqF3ix9To7XcPxlJXnmIFxkSpM7R7hJvxAWFBN8A7Lsits+
-MFweCoLCOnIeDdIIlM5fVXF0aRX3d8hPI6esnRDMQvtSM4fc/tGux4TGyqm9xNUL
-XE73vx0ig4cN/S+LB+aqvb29JWcL4UJEjF0KmDvoJImY812XYe53M5R/I44gpn+M
-VpnqVuENeOV3seRgxzxpfbA/TIjPtZLuNxeHR7dcGTvU631VfV7E/uxlSTZlxhCV
-CIASt2ITWU50Fzl2O8YDrRF6S0XehWsyr1uWfsDwZiZe9L5rHJSoEZMhPVWdnrtS
-DoLyd1u8
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDUz
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA1MzcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKoCopYkn0UTrH8NJT+5
+YZytmHtnVQjHV2dm18WsZEGH1W1fXG2XItOFDgM6EhOTcC6UL6pwmu4+Kv1kwkCJ
+aKUrgOuI5svqF9jYrJCVPk5EvWwrpag9Rg9uehlk8VRPTEg+UG3cqej1PrUCXiJ6
+CN0mggib0MyzcrmfZn1DLRGK6yGlshYvp4tZL++9q8b3K3+CRxRj1vfhU8dS6pPD
+Vg1SvA5j67sIVExoBb7B6so4DRJstxgCqP8QELBsh6NrYp7SY9xelHI5Hlhrxi5U
+3gxj0DiIFth/5rAenLejQyrmqJmvjFr5g89hf8hnc6/Yh8wZ7i7vGwo+F2on4e7x
+YLE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index c95e2678..d645c019 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">University of Iceland</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly93
-YXlmLmhpLmlzL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
-NTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMD8xPTA7BgNVBAMMNGh0dHBzOi8v
-d2F5Zi5oaS5pcy9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBADbgrT69n1ETF0MU8bADiTAYVVUf/ws+6Vl8
-heDaGrbl3kabIKmLZ/D0Gxfog2MFirs99jRRJ//oJn8ay+ZggpFGFsBlFrOhjOov
-usM9WeimuXGMu7Qf+HfGZMsySOidDip9DPDSrpNFn21L69tXeBwKVg4YXrAYCwsd
-BtjfSvGiarhQcGJyjobrT8Ya5fnJfbhmK+ndrKXXzNqXSA3VLaXdcahStn9ggTZW
-n3fIsF0rl6NtUF4VOfAP+YF6XQCbSgZ45R9DmQBX1BfDRQxTMiTA7PsfKk/4k8dp
-dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAw
+NTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMmYaG+pRB5/+W+9L0D7
+d9U4+UEdvSnAniC1kPv8sB5pdu4XlGGimFFWR7yUZlm+045a1CuKuGaCW+VdZxVr
+YZ9uABrsuHUrm8ejsJU40332CmdPqagNJfew6ozHxIQFXWS2DBmCg3PvDO+3c/Mo
+aeX7ui+rl6XkwObSeRm+fI2KIAPbHUWwhim4pNqC4xTu9xncGHNk1LMYr2K48K/U
+w94AuVNLyq4jQNzQnlcFBCu2P8W4z4wsZru1Eq75m/d3Bq2x3cEGWX4f8LQCWYZ1
+XHOMM/oxX68nDCHgc9EuQ3bOlAgBPIrtIjvELaAx9+QiIDL7OWztsd5byZZZ3FtR
+ODo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index 6652ebdc..c34d3aa9 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -20,25 +20,24 @@
         <mdui:DisplayName xml:lang="en">IT University of Copenhagen</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLml0dS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLml0dS5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
-/rlkEIuvFxDe1h4FO7WMFh3dIkC82lrGIjeQ2A+W3y63c8B5IMZtdWhPijud4isC
-9Hwfe4vZrdtQR+apYuWNha2SyVC7oCGPwitPpLc8VNU52BqA0drRpR/fkwi9g/81
-08MC3kiKYZQWptngeJFCcXnfj2XZ1EXP1U5cans1LLoWgJW4sxV0OpjLnE1jad3d
-7ClrQbgQfm/MUEo2xsbB+pp3VQOYN3c6+zXyVxNeHX0qSyOiJH+1Thk+xVcQn6yI
-3AbECYrCM2XBdYFYQ3JVD06i
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAy
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMjcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALW973DTjgam7bpZsjFs
+IgHFNcP07f6XNTrChN9Ru5lySQKD8WCwJrjgnYRnlkZahLO+8oCxQHH3RY4nhQsQ
+305Dz4bIjX+OlF/rLmo9TjXeGpJ7xiqTf9gJiZ5yhJrC3wyaLBN050dV3yB/dZas
+n0pnopRPe9rJip337efHFhkqMTdm4kXzVVHk5UbWaFEhnOq25cEmqYPSHhRMiscS
+9OowYiL+qYsTIMHvR4i/eIelCyMgnnPCYfJoXw10RBHWDgIjNq8dYRVotaIQYP6W
+d+YNRZU1W4cEMCKjhVhcJ6g/nHnudEORMQzpiBRHubR3plc8dzLBkal4QBc7xonv
+WxU=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
index f5ff923c..0215faf8 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">KEA – Copenhagen School of Design and Technology </mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLmtlYS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLmtlYS5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQBdrSXj2W3UAEcxPJUX953tiYwrSssEpmsa2TJjvuOFlf7Len2qkXwKFuqa6fkX
-zpaUpnwK8KdAT2OVgImQDduegBz62MMvgwsynVHKSbtogJnDTBVawnm50uX+elOJ
-+8W5tx4mmkWs3RSHII3aoxw4UWtqlTEdAxzjgysT9OKg0J9PhNpggGsE0Zl9BrFG
-/YyzGW8oEQcLPgFcO+EKd4IUQXTx4vyXeUoxBx+cq0SeOL4c4B0ozGBzBUI49TtW
-I0OwbOKPwRiX893Ccv+YmiFMj2fF97H8tyDo1KQ22YmrNvQuEvL1/JXycaism+sk
-p+TiM/eBbXCraZ32+zNbKfPC
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDgz
+NDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA4MzQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAOB5GgbQihGchmqD6sM8
+ul8P9jCJdawV52NaHr8RZyWlZ7vu9/Bd27xf7X0MI5T0J66YNrZwUYY6+QLX0WGu
+Xy9bGcV6GGQ7tW0l5yNtlU6XEcuGRgGlpueONvnZlrzIxaWDsaz2YR7okvtjYTJd
+GKalpPWoYrj82J+JidtfiDkgztmW2zR1i0qezi5FXXf6JP1hsnUTcWB50ZxUWwFB
+IfEVgE1zh/94wcnku2OD/Vkeiq0awkNXgQ8pHWQflpLhFtUXx+6/k8cUJ7Abc6SZ
+v97aXII+Iidp3OA6oksrmnrgMODu6wClPt6JC9SBLptlZSMj0MIqMM5URbla/67I
+17k=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
index b5b226a6..8bf5cd4d 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">The Administrative Library</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvZGFiMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZGFiMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBZTLirpYuda3idsPDunSvgdGVDzAayHmhLENyI
-chRBHPJRV/fQKacjhbVnGGFjMOMDPrl7IdEkBZOcHwuEJml1vnXuZTOiC1A7AVzt
-lYyNdPAGwHGM0SLvAQXzVKnoqjqwBLe8eQJ6LGkUD8QoXSttzpFqR9cE+OJygCyn
-lRBzNCIm1IZkQuafkF06Ldbfn6usiJ4SbjT1Hot8Gef9PpI9qeDDToHY6o+lbrCP
-aK8DxD18GwuVB0JFLjBNxqk4rJlYnB7k/q9JGrDqay8yfmFIAX9xoSpmz7qgHzK4
-v93+XEHzeHHw5pwvSa0YWMs2hXkVYFnHrTicG9bEV6qKoNYG
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDE2
+NDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAxNjQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFluE61XPNEjA6F8Vllp
+6si9U9PY0cPv1kfUS7AZO9UWW4oAUQc2Yw8xy+8e0oCwSpcHnNzSzxp+bAag+XKY
+h12N+a5b2Mj2Hw6qeluNvT5ScY1W20A++xvXdRo5mC2rFVJyLX89lmcSh2WUV3PJ
+tGffJenJGZ/YfbDVgD7bzC3Ni1qsw54qmaok4fds/YIYljMdpQSvyEnBuy83ogcH
+CHSl1R2jyA++Ty6XmW6LDgeXF24s9rnS9GYxeuExVGEWrJhlCdlvroxr/ZPMzoJu
+T7TG4GnhZMHljkl4RFntSWEfkZy4zUDbcjwMGDTQqXw5A1H++vhWmzmn1F4lUHld
+x4g=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
index fa20fef2..f51a54eb 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">Danish Defence Library</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvZnN2MB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZnN2MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCzm8tArdj5hPaX5D4YSQfelOgYx85np+xTsV2e
-9B61sXz6cmeJhhXG5kopY25z47llxJNLNhIwYLcR6NMIXx3K0xuKVnUo2U1c8BTk
-ar4OyNyenIMyJBtsRzrxSiISOeGwCpmMT8Lv1pg0QD2lJzBHiJF1ERDhwyRdLr5c
-QfeNv2Ip3MTZrAfB+w+MwB9qBK7+pIH/5ycxrHCDEfdA8iwQM8PP3EVXyQLOsd3R
-RvRh8L5qAmqKILhYkC4VV72qKZGsvzyWeKC752MsncEQF+fFHftvLSCWrTxaLWZD
-G9baPBH3swAjkG8Aa/+wabJPIBCF5mR8nO9gQQk4wgs17mS6
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDE3
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAxNzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACwHXdRE1PQ43PfJaP6G
+iqjnLM/5zHcBy4eCLQUmUnJpgGgc6sDway+XjjMwlFKp+8kGKTGKA4PFbDOh1jIS
+kc5Ndw37aexo692GlnRa6EoDbWJrDEb7l4v+LGKOVGVUlHz3oXR1lw4gbdVjI2BC
+TRvVCzzlc6TS5oY5HRTIBtJ25m3JafidfuScPafl4Nkyt3w5GhiOO4e+grpa1Ern
+qzR+HZqAKKDRRJWLyRkYE9wSsPUco0zfA3UT2KTFJjHgRjEwLN4PoyP6lPAZegT+
++4g4cuQbluZjCCD0C5srHp7azaUxcVSfw5tCH+0kWOc/vZQm/IiNTX65O/kez/di
+dqo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
index 57970139..908ee764 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Region Zealand</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC7jCCAdYCAQcwDQYJKoZIhvcNAQELBQAwPTE7MDkGA1UEAwwyaHR0cDovL3dh
-eWYucmVnaW9uc2phZWxsYW5kLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUw
-MTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjA9MTswOQYDVQQDDDJodHRwOi8vd2F5
-Zi5yZWdpb25zamFlbGxhbmQuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1
-Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f
-4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqq
-RLfonvr7DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLT
-UPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZd
-Csvrcq2uMhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAWioHWjcZmKtaIhgsfWkC9OBXtlSjU79oEUlUXQ8+
-X3Ke2+NnxArdG4ujwbmax5J5r/QKfqerTGyv/dUmOBP0s2e/cmSnEbgbbKl24zD+
-EMP/uDnruapr7JLOrHxorWLhBZqnFZ8MjfNSbN5+C7ExfK/CCihVeNIvRbjzUQn6
-9Q20RVpi3c0WG+0L2L/bZ3d53z/hphfyWIJa1wQhR1rr52Q9uTxHBCDYEk/c7Gsc
-rwtYNBxLwf4795W1TmN4o9E0vOfLPicDKL/HSNY33XOyW0xfZbg4NuLKuNQ3YyJU
-FCi7nKlzaklaH/SOTHq/dQBIWfezdWZwzJez/ZlcHeFV8g==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMTA5
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDEwOTcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABNNPURfCNSwS6PGFzyr
+3RJVKzfHn93tMMHQP6hk80+W8SaQ7VyCarupF4PO97o88EUhF3TzBd7jj+9deqKu
+NnIPFtlLBxCfn05+THnjZpwRFNIdYSF+BhRao2WhYfcOqi1KhnvO2lB4cbYNz39B
+uV3YF+USaWHzaZZr1KEHiqJCqW1gPyMSPn2pPWLc1vfKrDz8AJq5vXpKpeS9vOo0
+nUpVLxknkFCk1KM22j8KygG/H3r2PdBh9JgcB1lECl+DgAZsXZok23LXZYicxeE0
+C6aHYfBq/HqPi5kGAkC6L+pErNzHctE0tC+GYNhkdPR1U9TKBlfIlSbn+1hg2kKE
+NAs=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
index 0c961068..555d7cc3 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
@@ -18,24 +18,24 @@
         <mdui:DisplayName xml:lang="en">Roskilde University</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICuDCCAaACAQcwDQYJKoZIhvcNAQELBQAwIjEgMB4GA1UEAwwXaHR0cHM6Ly93
-YXlmLnJ1Yy5kay9pZHAwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjAi
-MSAwHgYDVQQDDBdodHRwczovL3dheWYucnVjLmRrL2lkcDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx
-6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/
-7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7
-DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2Zh
-HAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2u
-Mhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAbtW14fZzIDzTyThrU4usSNj4k55+3GjCX5RJPrnKe+NAVtOv
-+iNWzIDQOsEseFp/ZdJAauGt4VAf8bKnoFGqrnDLjPOu19i4ZU4zs8+n4oXYdSO5
-oynonbNEFOmR8N11WvwiVzhff7vsCZBDfAzagT5EGGxt943ewFft/fCD3dmJi4om
-eJmXoB5FPAQMLr3DzWb/j2O+3fbGa/FsfTtENtC+3TXKx7thYNlK3r/SfTuu/z25
-/6UOqRf2QoOU8rSzeh8FinMSZmOcghsD6gVacAQE1fOj10cun8iV6S/n08Qq9ANO
-LvJ2p7KuCR1XMFXRBimf3zUsLH5CKx4AOaUJ+A==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAw
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIu1NjCtoseYiNSR/XNh
+5K7qgIna0WGP9JkFWqwQc6TT7B475Pu9KdtG1QXGl3dTKVWBF4LMH0JW4TCWR2Gs
+DlEsLYU4+3c3fEx+ykf0UAraPehK17Lh32JKoOt0rkSc+m+naSeTUcZIa6wb3niD
+42Eh+ZqGVHNadkM9SIe9piFsaDEFTAbfHYQHrWHAAwxaAk7NAkEe7Fode8Bt/To4
+7oePFAQfJ7LWfA79SC4gZYiF31lpeKpRl8rGm+xlxEa6ogVQZ8FxnW2SDliuGV3m
+I9tT8n67xodk1h4WGg7pmjPn1nO4Z3rP6+dyAK6pdwGCPCv4e1zGbRDTxtQ86WYP
+LVo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
index 297303c1..81fdedde 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Rungsted High School</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly93
-YXlmLnJ1bmdzdGVkLWd5bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1
-MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowPjE8MDoGA1UEAwwzaHR0cHM6Ly93
-YXlmLnJ1bmdzdGVkLWd5bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBPEC6WcmmXP0aTLYTeX2oqrgB9F47P80GgnG8v
-DPKYlMKWEpJCIMxkvP0pN82NzmW5Dmj7vc2/iSXNCKny3fW3aXpqETVCX+WJ4U1N
-Oa48H037Tlyb3ICoCpYjkC2jQ62Z9RGwkptXp5jhzkQ3o3xf0ZQJiGxVzS+s5URR
-3FcsPKHz2R0RLAmhrCotDn/4d217E7RjBTAAqxZDaThlAURVQpmO6bPr+CyNnOYH
-r/xz9uFt2RzjLOXXnNTxdxNYM+57s7iSEGi7ysNfGUZJ8IY8sv2qGwGpYRcE+M6f
-7xRsD+6jlT/OE8V5tpBnDwexY8EONXcxN4WkVRvxfndoyJrq
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDEz
+MTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAxMzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAE/tThRM2bjAg3nzhvPz
+zAKl28TTLdI1qps5FXSOFwGwnK6xYjOMiTC7vKz/7zS6R8qnjjkV1S3sz6O3Mbdk
+TN2X37YY0tF00T5LGPaYRzjJaDYszFUpoQW0VNTdgEsBJ1FmvI2lKMLek9WQMbqx
+LFlLTbmjAmc4GBdR0sjtWpZbTp8Z1g+CsfbcyIQ6roo1NGzFVFd5Twh3K8ZJbwJr
+n3UIJ0Ap+vIELkDSFRSfO7p6qfA78x1AkWf71pYTLSE2bT+1wx0ssHjFgejGpmqg
+08AFIp3iZy2TaptGRI0GOKLSrKBNxCPjqt72iB/mwdFssyP+2Eq/iNx1S1JpPeRR
+dGc=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
index 83ea4f0b..4ddbd265 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
@@ -20,26 +20,24 @@
         <mdui:DisplayName xml:lang="en">Grenaa Gymnasium</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
-bml0PWdnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
-Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21l
-dGFkYXRhLnBocD91bml0PWdnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBMXkp3
-c1jLj0QNJYll4rzdfhyge7aut2vSTofZKZmd42aykUfPhQeJFyHGSkCNXE965QWw
-SJTvUUNaM3FZjae3TFY+o4lgF3KBkXGDV0nwH+IjzfJ89Cw7iCZ9NUYBsRuCRUIq
-zkJZODS1hgC75W28KoCKOiWmKN7v4+zyDk52aNm1jELnvHgmXfT6Ga7/GI+uusk3
-sxC5f4fnXJXaGsh7mXnW4r3JZkDFmHbaiqim80NgEDzlMgI9kb64p1mhM/vAMPu/
-1xqhR3VmCahpI8n6vII6+g07qhfc8GLzJ0jUaMyQoucpN4LwfIshLtBdOn9MCFVe
-Z8bY2QouT70h3w+L
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDA2
+MzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwNjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGGeEo09MFlVNEEG4jJs
+mPhk1UWuJ44P05RnZfvT/uL8GbgTco9W3mNRCLoMC0X5zZZ1k6aAunlSfD0ng5ob
+4nchJFCzpKCjc9nLncaIQPvkZNH9HjPVS1UVsUjcfmrt68vxLKHAc3sFhPJxIRO9
+GcsMsRL2lh39bG115v6vA/PfDLhBkztFVzEIJarILZQ8cSTLue0yvdZY7v7hOKTM
+UwJawcZhzt6KA+Egfbm/ZcsTt4JKizFV8IGF0EFx1kbgllN9KBwJuLyyq447wm9c
+R658cvncrbdVwQD2Qa5fFZpceJbh1xge8GAlVNxQpjvsyUd5DK66DKVQP/gDS4+t
+f0E=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
index ab4c2758..b94b3b7f 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
@@ -20,26 +20,24 @@
         <mdui:DisplayName xml:lang="en">Basic Health Care College Silkeborg</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDDDCCAfQCAQcwDQYJKoZIhvcNAQELBQAwTDFKMEgGA1UEAwxBaHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvc3NzL3NhbWwyL2lkcC9tZXRhZGF0YS5waHA/
-dW5pdD1zc3MwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBMMUowSAYD
-VQQDDEFodHRwczovL3dheWYuc3VwcG9ydGNlbnRlci5kay9zc3Mvc2FtbDIvaWRw
-L21ldGFkYXRhLnBocD91bml0PXNzczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
-zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
-lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
-vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
-mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
-R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-jP2/I0Mu2SqJ93nB4rXgdV5mSzWsFB4q7bkfA1Ra7XYzfSpGOvMHcqaaKcAchA1O
-yfx9LLQMEEBwHkR7pYk7LtaMcvkNVHkIJE7dtkhA2jDXzagwBAWqu8sYTxDjNjDJ
-7aZ+zaVDTBlH0rTmv4Vv2Qtyuw1KhOdYwGIcyHj59TYIVXXsPkGdpjZ6E9A+oN+m
-yXhtHaPq2WoDER6YZ1zcW2kp0iXpVku3TQo4oQhV65uC37g0748riJRED3HuCw+R
-SASmcxjMh0wZ/egIWQ4X3KUVvSPR+A5TJ5uS4KsccZMTb1ICyaUs7skEEWHkbPxO
-Z0FIk7cDlCfAO6WS9Da4VQ==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDA3
+MjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwNzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALeh3b+EdyhoWhAnrM/I
+cwBNmGAQ9eZz+WanlIz5kJH9uDfVGpjUsjIZ1t5LF1ONSNBteCRJ5cSK8nmRhCda
+ELeICmoxvtezjOjRBdtPUgu2E3ZoJYPGz3hk7CZr+qAx3kpmjXw48H3EANQvCx3o
+62Se4Oz/Z91MmDFXWJhFzrlQn1fxsp28FK0odCN2RjHEBSOjspsoCe4efJ7Atj1D
+U/ibtWjcGABvzaHmnZN8Hqgzl0Vt3F95lZSu6sf4IqSscKPJol3HuhEmAGN7d0MJ
+eczxUyvTtfeNSCqLxHqIdXU3K2zmvuP/IP4VbBNVX3s6VixCyOTzOIdyQAH23knq
+Wfc=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
index d79755cf..ae936a1d 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
@@ -20,25 +20,24 @@
         <mdui:DisplayName xml:lang="en">University College Capital</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLnVjYy5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLnVjYy5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQAyFPGtPhSizjmkWNHt3TSb6wivThTeOdRrzFx4zmrLGhX6doKosDfbfDiFU8ZX
-jc2OL/74ZDqgNBY+7lgUVm2BwvnKbMLZpj7GNZrkmBijI3FbY9WbgPb9jxur+4x7
-Hx8aS5jtHORjD7AI/421w3hxtSmda3AVwKfNXQNguSEeU/FY+HkBTKlJIWRVBmE0
-FH0FSKV0cnKaTGS/+zT7y9VKYtzFfxKWnz/xEAyOSCEDO0qqQKIMYd5b7JoBC1cd
-S3TzljfKRc31wT6ql3stZl4TiaW0i09yLSvSusZh9ApiFNgrzd5blywQujM78u9d
-XUPP28ILRNV6EqIHjKw4XqDP
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAy
+MTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEbWsvGJu/SW2gOdsvhx
+wk5AnXU7p87ysXu03pay+MFvj89xMEM2d5zRk14xkKJKU2YagMsyBXDYko6Tpse2
+KLepIt1CdX91WdEYPx/0vMN/hOSGiQHnHqodruVgJ5IPfyUarkzaG5XcD68eqIj/
+4Lhb/5PQGOr6Cw5vW/GYnBqWRLyKNOYKwgxD+dyjaA0p/aUalB19JIkIsf8cQ2wX
+Gc/XgOMu5+cxNPQOQOUV+WHt5qbRDa3Z582W9aqIyjOnT1BYaQJ8ZGrlok+eos89
++dg2fTXf/xjA+/WtbLrbsXvk2EcY0Gb80+9eBOVfvf7YhFZNx7m9g8WILW9obla4
+y44=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
index f056b647..783c03ed 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -20,25 +20,24 @@
         <mdui:DisplayName xml:lang="en">VIA University College</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC+DCCAeACAQcwDQYJKoZIhvcNAQELBQAwQjFAMD4GA1UEAww3aHR0cHM6Ly93
-YXlmLnZpYXVjLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAe
-Fw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMEIxQDA+BgNVBAMMN2h0dHBz
-Oi8vd2F5Zi52aWF1Yy5kay9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5w
-aHAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1
-rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCG
-PIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJ
-O0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJ
-nUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXi
-OcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvO
-w1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJLyoBjPprgZw7+PJUziqtx/XKbN
-HWNBLTHyukbdJuZITmsMdTnBDB1ZFLjQRx0xa1hEAzz6qAm8rAAUPPYNnYX6de4y
-+eutukD4eOrYOJrWXBgSRNh7pROKop7pcfF1O2kPJVKe5N6P2EosufIjedmg5M37
-95UnIU27my6t267qx3ucDya0tJn7P2YphiAJX4NnTb7pmlcy0VYlgKfHxyqn/yaF
-WNNvyHTFl7PX2VmlhOHPWxVCaL2HOsPyD62JGQoeGXNR0Y+HfZTXb3YpR9H+2x02
-p2YMU09Pb33T82fJfzyq0fwa2AhboACWsblekPEHoMxrzNQUuKzcoGbK+WI=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDAx
+NTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAwMTUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFLQvS5QHO/LaQFtRMf5
+CuPGwZA+HKEt47hzSDnSwyOVRKLU1DHhUCxHLeQIquLIdnGhBXkoTsFQkoEkiMha
+10sk0qdKr2rCMHVmz2GCCxKSLu+le2lhVm6Npk8h1hPotBIuJi04kaiA5L3A2eC8
++WAzjmdcrX+sMDoDkYoHwaI4fW/WudPLLPi01C30Jq2/6CJ1/lmkf0L1/69ZuHFy
+UWEMaWCEDJX7tRZpwFCRQbAedbpDvJi3wHR3qzXDUNFPIjNlZ4N6PMq+QHGQGwOX
+FHwesVNRvK9qAbWlznsNktH9GWaLHoHKuMgCi3+Msd1F35aUY23MbPvahYCrf1w9
+ROE=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
index 17d0d760..6049ff6a 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Cphbusiness</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL2NwaC9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
-MDAwWhcNMjUxMjMxMjM1OTU5WjA3MTUwMwYDVQQDDCxodHRwczovL3dheWZhLmVm
-aWYuZGsvY3BoL21vZHVsZS5waHAvc2FtbC9zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtL
-ORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa
-9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4
-TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr9
-1RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4
-JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAXYkUB3KKKS3nxBnhXZqlrJQ5DWkX8TLcSzBL2Aq3G9IWaf7Soe4vS+h6
-q8Zf58nFRsIs48747tEOEe+6ctBaUjPg6QRwzBFUdd0lbueBfwqJdEAX4jhULJx+
-4HA3xdECzyunvW5Es7DrGy2mhcFqJ7jjYPIHBT+kWtAlKqp9QSqhkgNYdZEY8nMl
-wndP/8uX4d5hJT06DOYCthpnBBHkVdt1Nkgm9t4oOgIO01nGAlQb51ehOgDxcZ2w
-mhTjWch83d/FOBNTJu8Jz88d7OBVMDKYAmUhSH1giRT19etnrMQNYFO6ATGhChGD
-tPD3c+RitftZZdVVSFgdbMdcTZ3log==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDc5
+NzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA3OTcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMJ0NpQs2idfru/6c6HC
+RPnJ7bfla+wumpxRaV7FiUxmkoTVGBedMmAoKzq89TdRSvD0Sijlt/pvjFZUnMcl
+IAw3mEjn0EJERM5JjYEb1UDlZHC2tPK6WQXoRTz4zVCZL4skAPRVWaJKM3GsC5c3
+cu0E652AT03wuAED9Ae56TdpOQOzSX3gNqcHeeqjIyh48gWtAaaXMwXUcvna+GFH
+GnTOfFtjJ/dwD+189SnfM/mBc0oSLaP323kvay0EoscwODY3A1oEW5iuOxfu8GWj
+Awnw+804mYoGeSRc8MUj4/jwHxphf85EwATfMAxl7g3alVl1nvUoPMaDH8S6BAd4
+biQ=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
index ef35ab22..8eba7cae 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Silkeborg Business College</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL2hzcy9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
-MDAwWhcNMjUxMjMxMjM1OTU5WjA3MTUwMwYDVQQDDCxodHRwczovL3dheWZhLmVm
-aWYuZGsvaHNzL21vZHVsZS5waHAvc2FtbC9zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtL
-ORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa
-9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4
-TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr9
-1RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4
-JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAZQrHLoQ3Q+QpOhDy0/Pyv855j5BAse04rysYjxLmWGx2wuJ/R1KSIg8v
-dl75Zg+Y9YCAokabg+70sFFmXzcXDNsJnHokEhoxg/wXuMvmEDuV/O2SAlEil2s3
-/zbxGYYSIiWKg9+j4Ww+0SmZTFwupoQ/SVIJ98RvZf2HxARpIaxYBQfs3Ck5eWRb
-bz5GUnlu3TdMglTDNoaGRYetlfLxThXv2TY6B3eVzNIf+lzWDZuXD5RQ5UhW3Ct9
-O32fOPSbeEsAgLHac/YxyxRPocEm5gtUZnjWAaSh2DPx+NEFVgUs2hUdFKOPWWGj
-adTtql0la2qKXumMxXSsTKT5/gU1yg==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDc5
+NjAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA3OTYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBANr50NW1rGW2Kh236eXn
+x+5xn8XPOABEFIBmh4Ppf5htN7UMJ8mykDanDCOVateFvM6pQEusQbgQF90saqx2
+ku5QWpQX5iXBp49qwqoT3Z51SKYI49RB8l/cr820h4MWlosOlQfvrVPIfflSVKrQ
+NufqrQtd4e2m9du1DO0pxfKqGdnDfACmEupURzKGdec0Iuo0KYtcP9F2M0DqLo+U
+T4fTXaY9rhjjZ01kXj18Wkrp2yqTfrIpk9FU40+4mvKt4OMHy87ikTk5/Ubve+pI
+YhVlLKjPhqK1Jf9SPUroKPM0vxkt0RxtBpd5tWIwZhARDsgJyFZhlcjKYcma1YMg
+h08=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
index b45ce072..f48d5904 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
@@ -18,25 +18,24 @@
         <mdui:DisplayName xml:lang="en">Koebenhavn Nord</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC4DCCAcgCAQcwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UEAwwraHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL2tuL21vZHVsZS5waHAvc2FtbC9zcDAeFw0xNTAxMDEwMDAw
-MDBaFw0yNTEyMzEyMzU5NTlaMDYxNDAyBgNVBAMMK2h0dHBzOi8vd2F5ZmEuZWZp
-Zi5kay9rbi9tb2R1bGUucGhwL3NhbWwvc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBALgTLyya/yHVro/tIPfNU+aCylPsY4UjDYaHR2T7csGNcrNJXD2VXrmWariK
-+h6/5bjA9OhxTXfVlQiG4WIGHgPAK6qoF8kCt2tXodzOqy/miIsAdm7F7O6xHdBi
-piOli11I72zwQmgI2HyoLW16So5u91aJl2ZVl1AjTdLsa6kPYLS6T8Eaov3ykYiv
-AW7kxcXdFFjoWfxP3UO5f77rc/54KqKB8uB4v94Ykjl96PY+Wh4piBonIkOYztDf
-hJ03VFOV8IXAD3AF0UBCfS66vspXEQov+7pogdsNDIZs7f3RXdhraCbxqQ6o9vp3
-oTQy5sOe4dSs2/n4/PlkBFwsHcE=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDYz
+MDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA2MzAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAcC4rMZR/64bTtZTjSx
+VbGBZ1Y4pG1wNLBj9XdJFqQVQScvJN42162jXIpAGLix8uWAdSpxtQaBRYPvqrqs
+tFUedvXEkDqs/SdS/Gfh9Dv+XwHGyRME/Jf4StNj/RJb8B7H0of9OmU7JvBIvaFq
+556bugmtC9teTkQyE4Wd8bDYcFit/wd7xZWsZp1shW+s2Sg4l5NZLuKGGyYj3oh8
+NlYV+dPMDB/MU9m/XPUV5bCgktq3btr/r6Jz6/QQLNCgyrmw8K8wxNRhXdlVVLko
+XIhScFbdC4BS4xtMsIwlKDbO52+8RC7ExUgkpbLWc9DWPkMFNprmLeWu7KGElTum
+UPg=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
index 5189ee77..5b6208f3 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
@@ -20,25 +20,24 @@
         <mdui:DisplayName xml:lang="en">Vordingborg Gymnasium and Higher Prep Exam</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL3Zvci9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
-MDAwWhcNMjUxMjMxMjM1OTU5WjA3MTUwMwYDVQQDDCxodHRwczovL3dheWZhLmVm
-aWYuZGsvdm9yL21vZHVsZS5waHAvc2FtbC9zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtL
-ORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa
-9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4
-TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr9
-1RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4
-JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAJUgv1wvoIuG7a8ojCGkBrbBDaUCkxIjXk5zICqrxAklwntByXEBowyo7
-6IxjXe0bYDz75kqf4l0yQQN/ENGAfdOf/Q1+pwKamQgCAVdPp/DIXppEci2KCuKh
-cTuIlPq5d15eDDc1nmmNwAxno/rbZrJfcTYFhilIVrh8SeOWUR4aaH/7lt5DaUoU
-wg1jaKgOGwDpiDMjm32YgZshdcKFnuJnHHYVbNY/6eKq8e79ynXV813+syVgnHkE
-vENDaE1u+5vQCZMkedatnmEe4tkT9LYoSD3l9/S8so1kgGfHsNk7Dv25wXZiKX+o
-AKktIsPch1tYllp+fb1/Be5pd2o+Aw==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDQy
+MTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA0MjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFrC2WYxwtnypIldo7gV
+RU2/dnO7PSGPqmCs3KrZu45GvmFf6L5Ax0z7P3HHZfpo550DLws8PzHN+1gshQ3+
+PCLxnZzAeFeMn2mgEvcS5WYngjAeKF3XMZD0LljgRlvrVqDM3baTQ81bCoAQ8xvn
+96vIvxWSNWliiZbpthI5abIstPqx2fufa/jsSZlki85KWEPRvpkgVcsU+kaHLeW7
+YOb6Ntn/+vq1goIdzi4MF5JiuWnr1jR6PH6t3YD0aOdD58OMSHRUMk8+G/PcgKUi
+fO7Zqk3caqUYEA2G/rhLce7MD9G74i/IoPFpUaoH4zpoDlJEarP8paoYTQK7IL/m
+/qA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-zbc-module.php-saml-sp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-zbc-module.php-saml-sp.xml
index 621e8b0a..f5e1d16a 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-zbc-module.php-saml-sp.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfa.efif.dk-zbc-module.php-saml-sp.xml
@@ -20,25 +20,24 @@
         <mdui:DisplayName xml:lang="en">Zealand Business College</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL3piYy9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
-MDAwWhcNMjUxMjMxMjM1OTU5WjA3MTUwMwYDVQQDDCxodHRwczovL3dheWZhLmVm
-aWYuZGsvemJjL21vZHVsZS5waHAvc2FtbC9zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtL
-ORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa
-9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4
-TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr9
-1RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4
-JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAG88v39vzM+tQHBI5Yl3rE5I/InzDV6er8gJDQ6VO/n8xjV12AwKAgsdp
-lTPv1NbaphRMKzQh2mzFLg5oDrI6CxejA4xpcaRol1VkrZIjXb/uAdYbhUpopMwj
-2Pniy+T4zN4eG0v5Z1xtahPiLjhlNYiUJUb6yat6V4bO2BoBeLSkO60h4smuOlJs
-PYRqaZvaO1ocR6cZuGaWYqZVRIDnu5qVHEQpQQTEh/4am12aauELgYwgHG1G0ldf
-pMlt8O2Lsy7KP3HJE7eAvCBTD57aBfP4tfqD9RurBSW+EsBP+AY930jxJYop2Xdi
-7Brk8LWiLkvExq3IH5VpXIbpmtd+7Q==
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDI1
+MTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDAyNTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKlPnjIX7v9sdS2R4ahv
+QMzD1UJ1YjVYI5nhG0CkX7bh+4wkLfp+VH5n8GVDLlFxjgpW8DKNGqQ7vDeZh6NJ
+e9EcZr4oL3vzHbVROCfDIROQ9D6nXNzH3cBwBqiUs46d4P2fNQCqBx5NLReFbliT
+hp25Q4JhPrMm/0iTn3Ol0dd/mfhkcuNif8VJt9zqudXtanbvt+DvjHbpSFbYBIIT
+KmIJcsfOr0yeetjj3fWOv09Vq2PKPGRVIqeVeHW8xdNLulErJ0eIZwT6cR3roWq5
+4CtxxWCc8Y2pzawl1DLrxaK9cdWUUt4nLLVoxwvHEyt9YwMgVjm7Wgzyt59vtVP2
+LHo=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
index cc293860..81cabfa8 100644
--- a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -18,26 +18,24 @@
         <mdui:DisplayName xml:lang="en">Dania – Danish Academy of Business and Technology</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDBDCCAewCAQcwDQYJKoZIhvcNAQELBQAwSDFGMEQGA1UEAww9aHR0cHM6Ly93
-YXlmZWFkYW5pYS5pdGNuLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRh
-LnBocDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMEgxRjBEBgNVBAMM
-PWh0dHBzOi8vd2F5ZmVhZGFuaWEuaXRjbi5kay9zaW1wbGVzYW1sL3NhbWwyL2lk
-cC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
-iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
-hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
-jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
-tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
-OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
-cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACwrTDkX0NVu
-aejzyGzGmNSb859ysfYWCM0pFT25khFQ4Ryi4H7Kywn/0ezDtVzlIifAYz+xiXk5
-HR0uRept/bOjP9Wy++UjE19fYQZrVqJWD+D7x3+lDIQ1GqZpQRTm/ZWT58m9B79t
-1hHhfYZHg+61j9UJZaz3eoGvp0q0Pjc+TJ9msuhHYOkFJ7IQiHH22xIUToi/Gjw2
-nSuM1kVbF1P4INZsCI7hE6VDj2HvrrteIsjQbH+uQUaskG/bYE35mo3AeiUlCml8
-lsZ14BWXRzkq1VI5Y+Zp/Zq3t8JSNW+T0O/TJXvjt5mdYhu9YKFTMVMujjE4v7qv
-2dNDLRpjcI8=
+          <ds:X509Certificate>MIICnjCCAYYCAQcwDQYJKoZIhvcNAQELBQAwFTETMBEGA1UEAwwKQklSSzAwMDg4
+NDAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMBUxEzARBgNVBAMMCkJJ
+UkswMDA4ODQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDngretRPjv
+dPY63lVFdbRR0HvZt4etdlt/Dmrln7VVa8B9AiaWAhRgDFAXAxZD4KHAPl6Qdqmn
+Rfv3ZxKyA201YMasnsAdEzlpjKKjJJ65JktMdAIkRyAbZMyFhWpvhMBrRRgOR8N7
+Ixj6A14OHBk+99bqApLbB+RC7fnhQ10gTlIMcis2X/DU10Wy5LCHT8TYGdOHuSWs
+BaNXJ2G01WEHJXjKjmGN6yA18QPAU5uGWAjZMSztL+2Cu/pnxeU9UOQuxV4r6ECP
+gNpov6hpcC7fqA/NY3WJIv7+wKV2YtLHXEaLwPR+MhQr+LU+X/z5bvGCfGl0hqSf
+IAEz7ZGPbpfXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACnng2IqSUIloLiIlBjc
+df6pJgBUEAN3V6PK/f3vozoDB0pzhqNQm71/lug+44GzSbS6/skaQN7jwIYijdY7
+uxM1NfqLgfH8p4FekxZTFK79PK/lUn190w4CIWvqPZbct2+hWTUznl0eb22RL8M8
+7vJi/on9qseAgUEhKbrI8jhJJRO2PS1XGl2QDTTAca6pbJigWINzIh1XqyLTAUfl
+4iw80UcxZ6oehPxHO1P520Emqe5Uwx0di6ab/WtP7WTB+O7JUNYAE9VMkr4Tmhdp
+1NyL6YU4o8linieDACNv2I2qwItjG9q2b0W/gSAchxivl7p4mwgFgJosLHnw43Hs
+HT4=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index a1e6388b..c141ab4c 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -98,7 +98,6 @@
       <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
@@ -307,7 +306,6 @@
       <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ntg.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
@@ -380,6 +378,7 @@
       <shibmd:Scope regexp="false">songdalen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sor-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sor-odal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
@@ -428,7 +427,6 @@
       <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ulstein.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
       <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
       <shibmd:Scope regexp="false">unis.no</shibmd:Scope>
       <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
@@ -441,6 +439,7 @@
       <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">valle.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vanylven.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vennesla.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">verran.kommune.no</shibmd:Scope>
@@ -454,6 +453,7 @@
       <shibmd:Scope regexp="false">vindafjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vinje.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">wang.no</shibmd:Scope>
       <shibmd:Scope regexp="false">westerdals.no</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/software.msdnaa.dk-.xml b/swamid-interfederations-1.0/software.msdnaa.dk-.xml
index ca409cf2..4cc3d35e 100644
--- a/swamid-interfederations-1.0/software.msdnaa.dk-.xml
+++ b/swamid-interfederations-1.0/software.msdnaa.dk-.xml
@@ -28,7 +28,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://software.msdnaa.dk/login.ashx"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://software.msdnaa.dk/login.ashx" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://software.msdnaa.dk/login.ashx" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">MSDNAA</md:ServiceName>
       <md:ServiceName xml:lang="en">MSDNAA</md:ServiceName>
diff --git a/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml b/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml
index 0a8d4072..56575e0c 100644
--- a/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml
+++ b/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml
@@ -27,7 +27,7 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dk.ibistic.net/redirector/saml/post/ac" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dk.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ibistic</md:ServiceName>
       <md:ServiceName xml:lang="en">Ibistic</md:ServiceName>
diff --git a/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml b/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml
index 25441848..5cc201dc 100644
--- a/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml
+++ b/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml
@@ -27,7 +27,7 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
       <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
diff --git a/swamid-interfederations-1.0/wayf.ordbogen.com.xml b/swamid-interfederations-1.0/wayf.ordbogen.com.xml
index 80e334c5..9603650d 100644
--- a/swamid-interfederations-1.0/wayf.ordbogen.com.xml
+++ b/swamid-interfederations-1.0/wayf.ordbogen.com.xml
@@ -28,7 +28,7 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.ordbogen.com/saml2/sp/SingleLogoutService.php"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.ordbogen.com/saml2/sp/AssertionConsumerService.php" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.ordbogen.com/saml2/sp/AssertionConsumerService.php" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
       <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>