diff --git a/roles/manage-server/files/metadata_export/saml20_idp.xml b/roles/manage-server/files/metadata_export/saml20_idp.xml
deleted file mode 100644
index 65dbae499..000000000
--- a/roles/manage-server/files/metadata_export/saml20_idp.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     entityID="{{entityid}}" validUntil="{{validUntil}}" cacheDuration="PT86400S">
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"
-                         WantAuthnRequestsSigned="true">
-        {{#metaDataFields.certData}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData}}
-        {{#metaDataFields.NameIDFormat}}
-        <md:NameIDFormat>{{metaDataFields.NameIDFormat}}</md:NameIDFormat>
-        {{/metaDataFields.NameIDFormat}}
-        {{#metaDataFields.SingleSignOnService:0:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:0:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:0:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:0:Location}}
-        {{#metaDataFields.SingleSignOnService:1:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:1:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:1:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:1:Location}}
-        {{#metaDataFields.SingleSignOnService:2:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:2:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:2:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:2:Location}}
-        {{#metaDataFields.SingleSignOnService:3:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:3:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:3:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:3:Location}}
-        {{#metaDataFields.SingleSignOnService:4:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:4:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:4:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:4:Location}}
-        {{#metaDataFields.SingleSignOnService:5:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:5:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:5:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:5:Location}}
-        {{#metaDataFields.SingleSignOnService:6:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:6:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:6:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:6:Location}}
-        {{#metaDataFields.SingleSignOnService:7:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:7:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:7:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:7:Location}}
-        {{#metaDataFields.SingleSignOnService:8:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:8:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:8:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:8:Location}}
-        {{#metaDataFields.SingleSignOnService:9:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:9:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:9:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:9:Location}}
-    </md:IDPSSODescriptor>
-    {{#metaDataFields.OrganizationName}}
-    <md:Organization>
-        <md:OrganizationName xml:lang="en">{{metaDataFields.OrganizationName}}</md:OrganizationName>
-        {{#metaDataFields.OrganizationDisplayName}}
-        <md:OrganizationDisplayName xml:lang="en">{{metaDataFields.OrganizationDisplayName}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName}}
-        {{#metaDataFields.OrganizationURL}}
-        <md:OrganizationURL xml:lang="en">{{metaDataFields.OrganizationURL}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL}}
-    </md:Organization>
-    {{/metaDataFields.OrganizationName}}
-    {{#metaDataFields.contacts:0:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:0:contactType}}">
-        {{#metaDataFields.contacts:0:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:0:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:0:givenName}}
-        {{#metaDataFields.contacts:0:surName}}
-        <md:SurName>{{metaDataFields.contacts:0:surName}}</md:SurName>
-        {{/metaDataFields.contacts:0:surName}}
-        {{#metaDataFields.contacts:0:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:0:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:0:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:0:contactType}}
-    {{#metaDataFields.contacts:1:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:1:contactType}}">
-        {{#metaDataFields.contacts:1:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:1:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:1:givenName}}
-        {{#metaDataFields.contacts:1:surName}}
-        <md:SurName>{{metaDataFields.contacts:1:surName}}</md:SurName>
-        {{/metaDataFields.contacts:1:surName}}
-        {{#metaDataFields.contacts:1:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:1:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:1:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:1:contactType}}
-    {{#metaDataFields.contacts:2:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:2:contactType}}">
-        {{#metaDataFields.contacts:2:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:2:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:2:givenName}}
-        {{#metaDataFields.contacts:2:surName}}
-        <md:SurName>{{metaDataFields.contacts:2:surName}}</md:SurName>
-        {{/metaDataFields.contacts:2:surName}}
-        {{#metaDataFields.contacts:2:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:2:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:2:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:2:contactType}}
-    {{#metaDataFields.contacts:3:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:3:contactType}}">
-        {{#metaDataFields.contacts:3:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:3:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:3:givenName}}
-        {{#metaDataFields.contacts:3:surName}}
-        <md:SurName>{{metaDataFields.contacts:3:surName}}</md:SurName>
-        {{/metaDataFields.contacts:3:surName}}
-        {{#metaDataFields.contacts:3:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:3:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:3:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:3:contactType}}
-</md:EntityDescriptor>
diff --git a/roles/manage-server/files/metadata_export/saml20_sp.xml b/roles/manage-server/files/metadata_export/saml20_sp.xml
deleted file mode 100644
index cb2b26afd..000000000
--- a/roles/manage-server/files/metadata_export/saml20_sp.xml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-                     xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
-                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     entityID="{{entityid}}" validUntil="{{validUntil}}" cacheDuration="PT86400S">
-  {{#metaDataFields.mdrpi:RegistrationInfo}}
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="{{metaDataFields.mdrpi:RegistrationInfo}}">
-      {{#metaDataFields.mdrpi:RegistrationPolicy:en}}
-      <mdrpi:RegistrationPolicy xml:lang="en">
-        {{metaDataFields.mdrpi:RegistrationPolicy:en}}
-      </mdrpi:RegistrationPolicy>
-      {{/metaDataFields.mdrpi:RegistrationPolicy:en}}
-      {{#metaDataFields.mdrpi:RegistrationPolicy:nl}}
-      <mdrpi:RegistrationPolicy xml:lang="nl">
-        {{metaDataFields.mdrpi:RegistrationPolicy:nl}}
-      </mdrpi:RegistrationPolicy>
-      {{/metaDataFields.mdrpi:RegistrationPolicy:nl}}
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  {{/metaDataFields.mdrpi:RegistrationInfo}}
-
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    {{#UIInfoExtension}}
-    <md:Extensions>
-      <mdui:UIInfo>
-        {{#metaDataFields.name:en}}
-        <mdui:DisplayName xml:lang="en">{{metaDataFields.name:en}}</mdui:DisplayName>
-        {{/metaDataFields.name:en}}
-        {{#metaDataFields.name:nl}}
-        <mdui:DisplayName xml:lang="nl">{{metaDataFields.name:nl}}</mdui:DisplayName>
-        {{/metaDataFields.name:nl}}
-        {{#metaDataFields.description:en}}
-        <mdui:Description xml:lang="en">{{metaDataFields.description:en}}</mdui:Description>
-        {{/metaDataFields.description:en}}
-        {{#metaDataFields.description:nl}}
-        <mdui:Description xml:lang="nl">{{metaDataFields.description:nl}}</mdui:Description>
-        {{/metaDataFields.description:nl}}
-        {{#Logo}}
-        <mdui:Logo width="{{metaDataFields.logo:0:width}}" height="{{metaDataFields.logo:0:height}}" xml:lang="en">{{metaDataFields.logo:0:url}}</mdui:Logo>
-        {{/Logo}}
-        {{#metaDataFields.mdui:PrivacyStatementURL:en}}
-        <mdui:PrivacyStatementURL xml:lang="en">{{metaDataFields.mdui:PrivacyStatementURL:en}}</mdui:PrivacyStatementURL>
-        {{/metaDataFields.mdui:PrivacyStatementURL:en}}
-        {{#metaDataFields.mdui:PrivacyStatementURL:nl}}
-        <mdui:PrivacyStatementURL xml:lang="nl">{{metaDataFields.mdui:PrivacyStatementURL:nl}}</mdui:PrivacyStatementURL>
-        {{/metaDataFields.mdui:PrivacyStatementURL:nl}}
-      </mdui:UIInfo>
-    </md:Extensions>
-    {{/UIInfoExtension}}
-    {{#metaDataFields.certData}}
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    {{/metaDataFields.certData}}
-    {{#metaDataFields.certData2}}
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    {{/metaDataFields.certData2}}
-    {{#metaDataFields.certData3}}
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    {{/metaDataFields.certData3}}
-    {{#metaDataFields.NameIDFormat}}
-    <md:NameIDFormat>{{metaDataFields.NameIDFormat}}</md:NameIDFormat>
-    {{/metaDataFields.NameIDFormat}}
-    {{#metaDataFields.AssertionConsumerService:0:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:0:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:0:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:0:index}}{{^metaDataFields.AssertionConsumerService:0:index}}0{{/metaDataFields.AssertionConsumerService:0:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:0:Location}}
-    {{#metaDataFields.AssertionConsumerService:1:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:1:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:1:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:1:index}}{{^metaDataFields.AssertionConsumerService:1:index}}1{{/metaDataFields.AssertionConsumerService:1:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:1:Location}}
-    {{#metaDataFields.AssertionConsumerService:2:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:2:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:2:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:2:index}}{{^metaDataFields.AssertionConsumerService:2:index}}2{{/metaDataFields.AssertionConsumerService:2:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:2:Location}}
-    {{#metaDataFields.AssertionConsumerService:3:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:3:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:3:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:3:index}}{{^metaDataFields.AssertionConsumerService:3:index}}3{{/metaDataFields.AssertionConsumerService:3:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:3:Location}}
-    {{#metaDataFields.AssertionConsumerService:4:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:4:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:4:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:4:index}}{{^metaDataFields.AssertionConsumerService:4:index}}4{{/metaDataFields.AssertionConsumerService:4:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:4:Location}}
-    {{#metaDataFields.AssertionConsumerService:5:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:5:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:5:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:5:index}}{{^metaDataFields.AssertionConsumerService:5:index}}5{{/metaDataFields.AssertionConsumerService:5:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:5:Location}}
-    {{#metaDataFields.AssertionConsumerService:6:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:6:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:6:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:6:index}}{{^metaDataFields.AssertionConsumerService:6:index}}6{{/metaDataFields.AssertionConsumerService:6:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:6:Location}}
-    {{#metaDataFields.AssertionConsumerService:7:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:7:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:7:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:7:index}}{{^metaDataFields.AssertionConsumerService:7:index}}7{{/metaDataFields.AssertionConsumerService:7:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:7:Location}}
-    {{#metaDataFields.AssertionConsumerService:8:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:8:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:8:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:8:index}}{{^metaDataFields.AssertionConsumerService:8:index}}8{{/metaDataFields.AssertionConsumerService:8:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:8:Location}}
-    {{#metaDataFields.AssertionConsumerService:9:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:9:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:9:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:9:index}}{{^metaDataFields.AssertionConsumerService:9:index}}9{{/metaDataFields.AssertionConsumerService:9:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:9:Location}}
-    {{#metaDataFields.AssertionConsumerService:10:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:10:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:10:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:10:index}}{{^metaDataFields.AssertionConsumerService:10:index}}10{{/metaDataFields.AssertionConsumerService:10:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:10:Location}}
-    {{#metaDataFields.AssertionConsumerService:11:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:11:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:11:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:11:index}}{{^metaDataFields.AssertionConsumerService:11:index}}11{{/metaDataFields.AssertionConsumerService:11:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:11:Location}}
-    {{#metaDataFields.AssertionConsumerService:12:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:12:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:12:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:12:index}}{{^metaDataFields.AssertionConsumerService:12:index}}12{{/metaDataFields.AssertionConsumerService:12:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:12:Location}}
-    {{#metaDataFields.AssertionConsumerService:13:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:13:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:13:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:13:index}}{{^metaDataFields.AssertionConsumerService:13:index}}13{{/metaDataFields.AssertionConsumerService:13:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:13:Location}}
-    {{#metaDataFields.AssertionConsumerService:14:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:14:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:14:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:14:index}}{{^metaDataFields.AssertionConsumerService:14:index}}14{{/metaDataFields.AssertionConsumerService:14:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:14:Location}}
-    {{#metaDataFields.AssertionConsumerService:15:Location}}
-    <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:15:Binding}}"
-                                 Location="{{metaDataFields.AssertionConsumerService:15:Location}}"
-                                 index="{{metaDataFields.AssertionConsumerService:15:index}}{{^metaDataFields.AssertionConsumerService:15:index}}15{{/metaDataFields.AssertionConsumerService:15:index}}"/>
-    {{/metaDataFields.AssertionConsumerService:15:Location}}
-    {{#AttributeConsumingService}}
-    <md:AttributeConsumingService index="0">
-      {{#metaDataFields.name:en}}
-      <md:ServiceName xml:lang="en">{{metaDataFields.name:en}}</md:ServiceName>
-      {{/metaDataFields.name:en}}
-      {{#metaDataFields.name:nl}}
-      <md:ServiceName xml:lang="nl">{{metaDataFields.name:nl}}</md:ServiceName>
-      {{/metaDataFields.name:nl}}
-      {{#metaDataFields.description:en}}
-      <md:ServiceDescription xml:lang="en">{{metaDataFields.description:en}}</md:ServiceDescription>
-      {{/metaDataFields.description:en}}
-      {{#metaDataFields.description:nl}}
-      <md:ServiceDescription xml:lang="nl">{{metaDataFields.description:nl}}</md:ServiceDescription>
-      {{/metaDataFields.description:nl}}
-      {{#requestedAttributes}}
-      <md:RequestedAttribute Name="{{toString}}"/>
-      {{/requestedAttributes}}
-    </md:AttributeConsumingService>
-    {{/AttributeConsumingService}}
-  </md:SPSSODescriptor>
-  {{#metaDataFields.OrganizationInfo}}
-  <md:Organization>
-    {{#metaDataFields.OrganizationName:en}}
-    <md:OrganizationName xml:lang="en">{{metaDataFields.OrganizationName:en}}</md:OrganizationName>
-    {{/metaDataFields.OrganizationName:en}}
-    {{#metaDataFields.OrganizationName:nl}}
-    <md:OrganizationName xml:lang="nl">{{metaDataFields.OrganizationName:nl}}</md:OrganizationName>
-    {{/metaDataFields.OrganizationName:nl}}
-    {{#metaDataFields.OrganizationDisplayName:en}}
-    <md:OrganizationDisplayName xml:lang="en">{{metaDataFields.OrganizationDisplayName:en}}</md:OrganizationDisplayName>
-    {{/metaDataFields.OrganizationDisplayName:en}}
-    {{#metaDataFields.OrganizationDisplayName:nl}}
-    <md:OrganizationDisplayName xml:lang="nl">{{metaDataFields.OrganizationDisplayName:nl}}</md:OrganizationDisplayName>
-    {{/metaDataFields.OrganizationDisplayName:nl}}
-    {{#metaDataFields.OrganizationURL:en}}
-    <md:OrganizationURL xml:lang="en">{{metaDataFields.OrganizationURL:en}}</md:OrganizationURL>
-    {{/metaDataFields.OrganizationURL:en}}
-    {{#metaDataFields.OrganizationURL:nl}}
-    <md:OrganizationURL xml:lang="nl">{{metaDataFields.OrganizationURL:nl}}</md:OrganizationURL>
-    {{/metaDataFields.OrganizationURL:nl}}
-  </md:Organization>
-  {{/metaDataFields.OrganizationInfo}}
-  {{#metaDataFields.contacts:0:contactType}}
-  <md:ContactPerson contactType="{{metaDataFields.contacts:0:contactType}}">
-    {{#metaDataFields.contacts:0:givenName}}
-    <md:GivenName>{{metaDataFields.contacts:0:givenName}}</md:GivenName>
-    {{/metaDataFields.contacts:0:givenName}}
-    {{#metaDataFields.contacts:0:surName}}
-    <md:SurName>{{metaDataFields.contacts:0:surName}}</md:SurName>
-    {{/metaDataFields.contacts:0:surName}}
-    {{#metaDataFields.contacts:0:emailAddress}}
-    <md:EmailAddress>mailto:{{metaDataFields.contacts:0:emailAddress}}</md:EmailAddress>
-    {{/metaDataFields.contacts:0:emailAddress}}
-    {{#metaDataFields.contacts:0:telephoneNumber}}
-    <md:TelephoneNumber>{{metaDataFields.contacts:0:telephoneNumber}}</md:TelephoneNumber>
-    {{/metaDataFields.contacts:0:telephoneNumber}}
-  </md:ContactPerson>
-  {{/metaDataFields.contacts:0:contactType}}
-  {{#metaDataFields.contacts:1:contactType}}
-  <md:ContactPerson contactType="{{metaDataFields.contacts:1:contactType}}">
-    {{#metaDataFields.contacts:1:givenName}}
-    <md:GivenName>{{metaDataFields.contacts:1:givenName}}</md:GivenName>
-    {{/metaDataFields.contacts:1:givenName}}
-    {{#metaDataFields.contacts:1:surName}}
-    <md:SurName>{{metaDataFields.contacts:1:surName}}</md:SurName>
-    {{/metaDataFields.contacts:1:surName}}
-    {{#metaDataFields.contacts:1:emailAddress}}
-    <md:EmailAddress>mailto:{{metaDataFields.contacts:1:emailAddress}}</md:EmailAddress>
-    {{/metaDataFields.contacts:1:emailAddress}}
-    {{#metaDataFields.contacts:1:telephoneNumber}}
-    <md:TelephoneNumber>{{metaDataFields.contacts:1:telephoneNumber}}</md:TelephoneNumber>
-    {{/metaDataFields.contacts:1:telephoneNumber}}
-  </md:ContactPerson>
-  {{/metaDataFields.contacts:1:contactType}}
-  {{#metaDataFields.contacts:2:contactType}}
-  <md:ContactPerson contactType="{{metaDataFields.contacts:2:contactType}}">
-    {{#metaDataFields.contacts:2:givenName}}
-    <md:GivenName>{{metaDataFields.contacts:2:givenName}}</md:GivenName>
-    {{/metaDataFields.contacts:2:givenName}}
-    {{#metaDataFields.contacts:2:surName}}
-    <md:SurName>{{metaDataFields.contacts:2:surName}}</md:SurName>
-    {{/metaDataFields.contacts:2:surName}}
-    {{#metaDataFields.contacts:2:emailAddress}}
-    <md:EmailAddress>mailto:{{metaDataFields.contacts:2:emailAddress}}</md:EmailAddress>
-    {{/metaDataFields.contacts:2:emailAddress}}
-    {{#metaDataFields.contacts:2:telephoneNumber}}
-    <md:TelephoneNumber>{{metaDataFields.contacts:2:telephoneNumber}}</md:TelephoneNumber>
-    {{/metaDataFields.contacts:2:telephoneNumber}}
-  </md:ContactPerson>
-  {{/metaDataFields.contacts:2:contactType}}
-  {{#metaDataFields.contacts:3:contactType}}
-  <md:ContactPerson contactType="{{metaDataFields.contacts:3:contactType}}">
-    {{#metaDataFields.contacts:3:givenName}}
-    <md:GivenName>{{metaDataFields.contacts:3:givenName}}</md:GivenName>
-    {{/metaDataFields.contacts:3:givenName}}
-    {{#metaDataFields.contacts:3:surName}}
-    <md:SurName>{{metaDataFields.contacts:3:surName}}</md:SurName>
-    {{/metaDataFields.contacts:3:surName}}
-    {{#metaDataFields.contacts:3:emailAddress}}
-    <md:EmailAddress>mailto:{{metaDataFields.contacts:3:emailAddress}}</md:EmailAddress>
-    {{/metaDataFields.contacts:3:emailAddress}}
-    {{#metaDataFields.contacts:3:telephoneNumber}}
-    <md:TelephoneNumber>{{metaDataFields.contacts:3:telephoneNumber}}</md:TelephoneNumber>
-    {{/metaDataFields.contacts:3:telephoneNumber}}
-  </md:ContactPerson>
-  {{/metaDataFields.contacts:3:contactType}}
-
-</md:EntityDescriptor>
diff --git a/roles/manage-server/files/metadata_export/single_tenant_template.xml b/roles/manage-server/files/metadata_export/single_tenant_template.xml
deleted file mode 100644
index 3511c63da..000000000
--- a/roles/manage-server/files/metadata_export/single_tenant_template.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     entityID="{{entityid}}" validUntil="{{validUntil}}" cacheDuration="PT86400S">
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        {{#UIInfoExtension}}
-        <md:Extensions>
-            <mdui:UIInfo>
-                {{#metaDataFields.name:en}}
-                <mdui:DisplayName xml:lang="en">{{metaDataFields.name:en}}</mdui:DisplayName>
-                {{/metaDataFields.name:en}}
-                {{#metaDataFields.name:nl}}
-                <mdui:DisplayName xml:lang="nl">{{metaDataFields.name:nl}}</mdui:DisplayName>
-                {{/metaDataFields.name:nl}}
-                {{#metaDataFields.description:en}}
-                <mdui:Description xml:lang="en">{{metaDataFields.description:en}}</mdui:Description>
-                {{/metaDataFields.description:en}}
-                {{#metaDataFields.description:nl}}
-                <mdui:Description xml:lang="nl">{{metaDataFields.description:nl}}</mdui:Description>
-                {{/metaDataFields.description:nl}}
-                {{#Logo}}
-                <mdui:Logo width="{{metaDataFields.logo:0:width}}" height="{{metaDataFields.logo:0:height}}" xml:lang="en">{{metaDataFields.logo:0:url}}</mdui:Logo>
-                {{/Logo}}
-            </mdui:UIInfo>
-        </md:Extensions>
-        {{/UIInfoExtension}}
-        {{#metaDataFields.certData}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData}}
-        {{#metaDataFields.certData2}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData2}}
-        {{#metaDataFields.certData3}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData3}}
-        {{#metaDataFields.NameIDFormat}}
-        <md:NameIDFormat>{{metaDataFields.NameIDFormat}}</md:NameIDFormat>
-        {{/metaDataFields.NameIDFormat}}
-        {{#metaDataFields.AssertionConsumerService:0:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:0:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:0:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:0:index}}{{^metaDataFields.AssertionConsumerService:0:index}}0{{/metaDataFields.AssertionConsumerService:0:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:0:Location}}
-        {{#metaDataFields.AssertionConsumerService:1:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:1:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:1:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:1:index}}{{^metaDataFields.AssertionConsumerService:1:index}}1{{/metaDataFields.AssertionConsumerService:1:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:1:Location}}
-        {{#metaDataFields.AssertionConsumerService:2:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:2:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:2:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:2:index}}{{^metaDataFields.AssertionConsumerService:2:index}}2{{/metaDataFields.AssertionConsumerService:2:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:2:Location}}
-        {{#metaDataFields.AssertionConsumerService:3:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:3:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:3:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:3:index}}{{^metaDataFields.AssertionConsumerService:3:index}}3{{/metaDataFields.AssertionConsumerService:3:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:3:Location}}
-        {{#metaDataFields.AssertionConsumerService:4:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:4:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:4:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:4:index}}{{^metaDataFields.AssertionConsumerService:4:index}}4{{/metaDataFields.AssertionConsumerService:4:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:4:Location}}
-        {{#metaDataFields.AssertionConsumerService:5:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:5:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:5:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:5:index}}{{^metaDataFields.AssertionConsumerService:5:index}}5{{/metaDataFields.AssertionConsumerService:5:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:5:Location}}
-        {{#metaDataFields.AssertionConsumerService:6:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:6:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:6:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:6:index}}{{^metaDataFields.AssertionConsumerService:6:index}}6{{/metaDataFields.AssertionConsumerService:6:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:6:Location}}
-        {{#metaDataFields.AssertionConsumerService:7:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:7:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:7:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:7:index}}{{^metaDataFields.AssertionConsumerService:7:index}}7{{/metaDataFields.AssertionConsumerService:7:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:7:Location}}
-        {{#metaDataFields.AssertionConsumerService:8:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:8:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:8:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:8:index}}{{^metaDataFields.AssertionConsumerService:8:index}}8{{/metaDataFields.AssertionConsumerService:8:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:8:Location}}
-        {{#metaDataFields.AssertionConsumerService:9:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:9:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:9:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:9:index}}{{^metaDataFields.AssertionConsumerService:9:index}}9{{/metaDataFields.AssertionConsumerService:9:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:9:Location}}
-        {{#AttributeConsumingService}}
-        <md:AttributeConsumingService index="0">
-            {{#metaDataFields.name:en}}
-            <md:ServiceName xml:lang="en">{{metaDataFields.name:en}}</md:ServiceName>
-            {{/metaDataFields.name:en}}
-            {{#metaDataFields.name:nl}}
-            <md:ServiceName xml:lang="nl">{{metaDataFields.name:nl}}</md:ServiceName>
-            {{/metaDataFields.name:nl}}
-            {{#metaDataFields.description:en}}
-            <md:ServiceDescription xml:lang="en">{{metaDataFields.description:en}}</md:ServiceDescription>
-            {{/metaDataFields.description:en}}
-            {{#metaDataFields.description:nl}}
-            <md:ServiceDescription xml:lang="nl">{{metaDataFields.description:nl}}</md:ServiceDescription>
-            {{/metaDataFields.description:nl}}
-            {{#requestedAttributes}}
-            <md:RequestedAttribute Name="{{toString}}"/>
-            {{/requestedAttributes}}
-        </md:AttributeConsumingService>
-        {{/AttributeConsumingService}}
-    </md:SPSSODescriptor>
-    {{#metaDataFields.OrganizationInfo}}
-    <md:Organization>
-        {{#metaDataFields.OrganizationName:en}}
-        <md:OrganizationName xml:lang="en">{{metaDataFields.OrganizationName:en}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:en}}
-        {{#metaDataFields.OrganizationName:nl}}
-        <md:OrganizationName xml:lang="nl">{{metaDataFields.OrganizationName:nl}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:nl}}
-        {{#metaDataFields.OrganizationDisplayName:en}}
-        <md:OrganizationDisplayName xml:lang="en">{{metaDataFields.OrganizationDisplayName:en}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:en}}
-        {{#metaDataFields.OrganizationDisplayName:nl}}
-        <md:OrganizationDisplayName xml:lang="nl">{{metaDataFields.OrganizationDisplayName:nl}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:nl}}
-        {{#metaDataFields.OrganizationURL:en}}
-        <md:OrganizationURL xml:lang="en">{{metaDataFields.OrganizationURL:en}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:en}}
-        {{#metaDataFields.OrganizationURL:nl}}
-        <md:OrganizationURL xml:lang="nl">{{metaDataFields.OrganizationURL:nl}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:nl}}
-    </md:Organization>
-    {{/metaDataFields.OrganizationInfo}}
-    {{#metaDataFields.contacts:0:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:0:contactType}}">
-        {{#metaDataFields.contacts:0:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:0:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:0:givenName}}
-        {{#metaDataFields.contacts:0:surName}}
-        <md:SurName>{{metaDataFields.contacts:0:surName}}</md:SurName>
-        {{/metaDataFields.contacts:0:surName}}
-        {{#metaDataFields.contacts:0:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:0:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:0:emailAddress}}
-        {{#metaDataFields.contacts:0:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:0:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:0:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:0:contactType}}
-    {{#metaDataFields.contacts:1:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:1:contactType}}">
-        {{#metaDataFields.contacts:1:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:1:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:1:givenName}}
-        {{#metaDataFields.contacts:1:surName}}
-        <md:SurName>{{metaDataFields.contacts:1:surName}}</md:SurName>
-        {{/metaDataFields.contacts:1:surName}}
-        {{#metaDataFields.contacts:1:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:1:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:1:emailAddress}}
-        {{#metaDataFields.contacts:1:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:1:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:1:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:1:contactType}}
-    {{#metaDataFields.contacts:2:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:2:contactType}}">
-        {{#metaDataFields.contacts:2:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:2:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:2:givenName}}
-        {{#metaDataFields.contacts:2:surName}}
-        <md:SurName>{{metaDataFields.contacts:2:surName}}</md:SurName>
-        {{/metaDataFields.contacts:2:surName}}
-        {{#metaDataFields.contacts:2:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:2:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:2:emailAddress}}
-        {{#metaDataFields.contacts:2:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:2:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:2:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:2:contactType}}
-    {{#metaDataFields.contacts:3:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:3:contactType}}">
-        {{#metaDataFields.contacts:3:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:3:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:3:givenName}}
-        {{#metaDataFields.contacts:3:surName}}
-        <md:SurName>{{metaDataFields.contacts:3:surName}}</md:SurName>
-        {{/metaDataFields.contacts:3:surName}}
-        {{#metaDataFields.contacts:3:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:3:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:3:emailAddress}}
-        {{#metaDataFields.contacts:3:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:3:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:3:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:3:contactType}}
-
-</md:EntityDescriptor>
diff --git a/roles/manage-server/files/metadata_export_local/saml20_idp.xml b/roles/manage-server/files/metadata_export_local/saml20_idp.xml
deleted file mode 100644
index 65dbae499..000000000
--- a/roles/manage-server/files/metadata_export_local/saml20_idp.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     entityID="{{entityid}}" validUntil="{{validUntil}}" cacheDuration="PT86400S">
-    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"
-                         WantAuthnRequestsSigned="true">
-        {{#metaDataFields.certData}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData}}
-        {{#metaDataFields.NameIDFormat}}
-        <md:NameIDFormat>{{metaDataFields.NameIDFormat}}</md:NameIDFormat>
-        {{/metaDataFields.NameIDFormat}}
-        {{#metaDataFields.SingleSignOnService:0:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:0:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:0:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:0:Location}}
-        {{#metaDataFields.SingleSignOnService:1:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:1:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:1:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:1:Location}}
-        {{#metaDataFields.SingleSignOnService:2:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:2:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:2:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:2:Location}}
-        {{#metaDataFields.SingleSignOnService:3:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:3:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:3:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:3:Location}}
-        {{#metaDataFields.SingleSignOnService:4:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:4:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:4:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:4:Location}}
-        {{#metaDataFields.SingleSignOnService:5:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:5:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:5:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:5:Location}}
-        {{#metaDataFields.SingleSignOnService:6:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:6:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:6:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:6:Location}}
-        {{#metaDataFields.SingleSignOnService:7:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:7:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:7:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:7:Location}}
-        {{#metaDataFields.SingleSignOnService:8:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:8:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:8:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:8:Location}}
-        {{#metaDataFields.SingleSignOnService:9:Location}}
-        <md:SingleSignOnService Binding="{{metaDataFields.SingleSignOnService:9:Binding}}"
-                                Location="{{metaDataFields.SingleSignOnService:9:Location}}"/>
-        {{/metaDataFields.SingleSignOnService:9:Location}}
-    </md:IDPSSODescriptor>
-    {{#metaDataFields.OrganizationName}}
-    <md:Organization>
-        <md:OrganizationName xml:lang="en">{{metaDataFields.OrganizationName}}</md:OrganizationName>
-        {{#metaDataFields.OrganizationDisplayName}}
-        <md:OrganizationDisplayName xml:lang="en">{{metaDataFields.OrganizationDisplayName}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName}}
-        {{#metaDataFields.OrganizationURL}}
-        <md:OrganizationURL xml:lang="en">{{metaDataFields.OrganizationURL}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL}}
-    </md:Organization>
-    {{/metaDataFields.OrganizationName}}
-    {{#metaDataFields.contacts:0:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:0:contactType}}">
-        {{#metaDataFields.contacts:0:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:0:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:0:givenName}}
-        {{#metaDataFields.contacts:0:surName}}
-        <md:SurName>{{metaDataFields.contacts:0:surName}}</md:SurName>
-        {{/metaDataFields.contacts:0:surName}}
-        {{#metaDataFields.contacts:0:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:0:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:0:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:0:contactType}}
-    {{#metaDataFields.contacts:1:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:1:contactType}}">
-        {{#metaDataFields.contacts:1:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:1:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:1:givenName}}
-        {{#metaDataFields.contacts:1:surName}}
-        <md:SurName>{{metaDataFields.contacts:1:surName}}</md:SurName>
-        {{/metaDataFields.contacts:1:surName}}
-        {{#metaDataFields.contacts:1:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:1:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:1:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:1:contactType}}
-    {{#metaDataFields.contacts:2:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:2:contactType}}">
-        {{#metaDataFields.contacts:2:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:2:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:2:givenName}}
-        {{#metaDataFields.contacts:2:surName}}
-        <md:SurName>{{metaDataFields.contacts:2:surName}}</md:SurName>
-        {{/metaDataFields.contacts:2:surName}}
-        {{#metaDataFields.contacts:2:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:2:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:2:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:2:contactType}}
-    {{#metaDataFields.contacts:3:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:3:contactType}}">
-        {{#metaDataFields.contacts:3:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:3:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:3:givenName}}
-        {{#metaDataFields.contacts:3:surName}}
-        <md:SurName>{{metaDataFields.contacts:3:surName}}</md:SurName>
-        {{/metaDataFields.contacts:3:surName}}
-        {{#metaDataFields.contacts:3:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:3:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:3:emailAddress}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:3:contactType}}
-</md:EntityDescriptor>
diff --git a/roles/manage-server/files/metadata_export_local/saml20_sp.xml b/roles/manage-server/files/metadata_export_local/saml20_sp.xml
deleted file mode 100644
index a21a2226c..000000000
--- a/roles/manage-server/files/metadata_export_local/saml20_sp.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-                     xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
-                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     entityID="{{entityid}}" validUntil="{{validUntil}}" cacheDuration="PT86400S">
-    {{#metaDataFields.mdrpi:RegistrationInfo}}
-    <md:Extensions>
-        <mdrpi:RegistrationInfo registrationAuthority="{{metaDataFields.mdrpi:RegistrationInfo}}">
-            {{#metaDataFields.mdrpi:RegistrationPolicy:en}}
-            <mdrpi:RegistrationPolicy xml:lang="en">
-            {{metaDataFields.mdrpi:RegistrationPolicy:en}}
-            </mdrpi:RegistrationPolicy>
-            {{/metaDataFields.mdrpi:RegistrationPolicy:en}}
-            {{#metaDataFields.mdrpi:RegistrationPolicy:nl}}
-            <mdrpi:RegistrationPolicy xml:lang="nl">
-            {{metaDataFields.mdrpi:RegistrationPolicy:nl}}
-            </mdrpi:RegistrationPolicy>
-            {{/metaDataFields.mdrpi:RegistrationPolicy:nl}}
-        </mdrpi:RegistrationInfo>
-    </md:Extensions>
-    {{/metaDataFields.mdrpi:RegistrationInfo}}
-
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        {{#UIInfoExtension}}
-        <md:Extensions>
-            <mdui:UIInfo>
-                {{#metaDataFields.name:en}}
-                <mdui:DisplayName xml:lang="en">{{metaDataFields.name:en}}</mdui:DisplayName>
-                {{/metaDataFields.name:en}}
-                {{#metaDataFields.name:nl}}
-                <mdui:DisplayName xml:lang="nl">{{metaDataFields.name:nl}}</mdui:DisplayName>
-                {{/metaDataFields.name:nl}}
-                {{#metaDataFields.name:pt}}
-                <mdui:DisplayName xml:lang="pt">{{metaDataFields.name:pt}}</mdui:DisplayName>
-                {{/metaDataFields.name:pt}}
-                {{#metaDataFields.description:en}}
-                <mdui:Description xml:lang="en">{{metaDataFields.description:en}}</mdui:Description>
-                {{/metaDataFields.description:en}}
-                {{#metaDataFields.description:nl}}
-                <mdui:Description xml:lang="nl">{{metaDataFields.description:nl}}</mdui:Description>
-                {{/metaDataFields.description:nl}}
-                {{#metaDataFields.description:pt}}
-                <mdui:Description xml:lang="pt">{{metaDataFields.description:pt}}</mdui:Description>
-                {{/metaDataFields.description:pt}}
-                {{#Logo}}
-                <mdui:Logo width="{{metaDataFields.logo:0:width}}" height="{{metaDataFields.logo:0:height}}" xml:lang="en">{{metaDataFields.logo:0:url}}</mdui:Logo>
-                {{/Logo}}
-                {{#metaDataFields.mdui:PrivacyStatementURL:en}}
-                <mdui:PrivacyStatementURL xml:lang="en">{{metaDataFields.mdui:PrivacyStatementURL:en}}</mdui:PrivacyStatementURL>
-                {{/metaDataFields.mdui:PrivacyStatementURL:en}}
-                {{#metaDataFields.mdui:PrivacyStatementURL:nl}}
-                <mdui:PrivacyStatementURL xml:lang="nl">{{metaDataFields.mdui:PrivacyStatementURL:nl}}</mdui:PrivacyStatementURL>
-                {{/metaDataFields.mdui:PrivacyStatementURL:nl}}
-            </mdui:UIInfo>
-        </md:Extensions>
-        {{/UIInfoExtension}}
-        {{#metaDataFields.certData}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData}}
-        {{#metaDataFields.certData2}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData2}}
-        {{#metaDataFields.certData3}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData3}}
-        {{#metaDataFields.NameIDFormat}}
-        <md:NameIDFormat>{{metaDataFields.NameIDFormat}}</md:NameIDFormat>
-        {{/metaDataFields.NameIDFormat}}
-        {{#metaDataFields.AssertionConsumerService:0:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:0:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:0:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:0:index}}{{^metaDataFields.AssertionConsumerService:0:index}}0{{/metaDataFields.AssertionConsumerService:0:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:0:Location}}
-        {{#metaDataFields.AssertionConsumerService:1:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:1:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:1:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:1:index}}{{^metaDataFields.AssertionConsumerService:1:index}}1{{/metaDataFields.AssertionConsumerService:1:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:1:Location}}
-        {{#metaDataFields.AssertionConsumerService:2:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:2:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:2:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:2:index}}{{^metaDataFields.AssertionConsumerService:2:index}}2{{/metaDataFields.AssertionConsumerService:2:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:2:Location}}
-        {{#metaDataFields.AssertionConsumerService:3:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:3:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:3:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:3:index}}{{^metaDataFields.AssertionConsumerService:3:index}}3{{/metaDataFields.AssertionConsumerService:3:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:3:Location}}
-        {{#metaDataFields.AssertionConsumerService:4:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:4:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:4:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:4:index}}{{^metaDataFields.AssertionConsumerService:4:index}}4{{/metaDataFields.AssertionConsumerService:4:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:4:Location}}
-        {{#metaDataFields.AssertionConsumerService:5:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:5:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:5:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:5:index}}{{^metaDataFields.AssertionConsumerService:5:index}}5{{/metaDataFields.AssertionConsumerService:5:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:5:Location}}
-        {{#metaDataFields.AssertionConsumerService:6:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:6:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:6:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:6:index}}{{^metaDataFields.AssertionConsumerService:6:index}}6{{/metaDataFields.AssertionConsumerService:6:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:6:Location}}
-        {{#metaDataFields.AssertionConsumerService:7:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:7:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:7:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:7:index}}{{^metaDataFields.AssertionConsumerService:7:index}}7{{/metaDataFields.AssertionConsumerService:7:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:7:Location}}
-        {{#metaDataFields.AssertionConsumerService:8:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:8:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:8:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:8:index}}{{^metaDataFields.AssertionConsumerService:8:index}}8{{/metaDataFields.AssertionConsumerService:8:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:8:Location}}
-        {{#metaDataFields.AssertionConsumerService:9:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:9:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:9:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:9:index}}{{^metaDataFields.AssertionConsumerService:9:index}}9{{/metaDataFields.AssertionConsumerService:9:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:9:Location}}
-        {{#metaDataFields.AssertionConsumerService:10:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:10:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:10:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:10:index}}{{^metaDataFields.AssertionConsumerService:10:index}}10{{/metaDataFields.AssertionConsumerService:10:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:10:Location}}
-        {{#metaDataFields.AssertionConsumerService:11:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:11:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:11:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:11:index}}{{^metaDataFields.AssertionConsumerService:11:index}}11{{/metaDataFields.AssertionConsumerService:11:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:11:Location}}
-        {{#metaDataFields.AssertionConsumerService:12:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:12:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:12:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:12:index}}{{^metaDataFields.AssertionConsumerService:12:index}}12{{/metaDataFields.AssertionConsumerService:12:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:12:Location}}
-        {{#metaDataFields.AssertionConsumerService:13:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:13:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:13:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:13:index}}{{^metaDataFields.AssertionConsumerService:13:index}}13{{/metaDataFields.AssertionConsumerService:13:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:13:Location}}
-        {{#metaDataFields.AssertionConsumerService:14:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:14:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:14:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:14:index}}{{^metaDataFields.AssertionConsumerService:14:index}}14{{/metaDataFields.AssertionConsumerService:14:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:14:Location}}
-        {{#metaDataFields.AssertionConsumerService:15:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:15:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:15:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:15:index}}{{^metaDataFields.AssertionConsumerService:15:index}}15{{/metaDataFields.AssertionConsumerService:15:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:15:Location}}
-        {{#metaDataFields.AssertionConsumerService:16:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:16:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:16:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:16:index}}{{^metaDataFields.AssertionConsumerService:16:index}}16{{/metaDataFields.AssertionConsumerService:16:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:16:Location}}
-        {{#metaDataFields.AssertionConsumerService:17:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:17:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:17:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:17:index}}{{^metaDataFields.AssertionConsumerService:17:index}}17{{/metaDataFields.AssertionConsumerService:17:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:17:Location}}
-        {{#metaDataFields.AssertionConsumerService:18:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:18:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:18:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:18:index}}{{^metaDataFields.AssertionConsumerService:18:index}}18{{/metaDataFields.AssertionConsumerService:18:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:18:Location}}
-        {{#metaDataFields.AssertionConsumerService:19:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:19:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:19:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:19:index}}{{^metaDataFields.AssertionConsumerService:19:index}}19{{/metaDataFields.AssertionConsumerService:19:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:19:Location}}
-        {{#metaDataFields.AssertionConsumerService:20:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:20:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:20:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:20:index}}{{^metaDataFields.AssertionConsumerService:20:index}}20{{/metaDataFields.AssertionConsumerService:20:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:20:Location}}
-        {{#metaDataFields.AssertionConsumerService:21:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:21:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:21:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:21:index}}{{^metaDataFields.AssertionConsumerService:21:index}}21{{/metaDataFields.AssertionConsumerService:21:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:21:Location}}
-        {{#metaDataFields.AssertionConsumerService:22:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:22:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:22:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:22:index}}{{^metaDataFields.AssertionConsumerService:22:index}}22{{/metaDataFields.AssertionConsumerService:22:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:22:Location}}
-        {{#metaDataFields.AssertionConsumerService:23:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:23:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:23:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:23:index}}{{^metaDataFields.AssertionConsumerService:23:index}}23{{/metaDataFields.AssertionConsumerService:23:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:23:Location}}
-        {{#metaDataFields.AssertionConsumerService:24:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:24:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:24:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:24:index}}{{^metaDataFields.AssertionConsumerService:24:index}}24{{/metaDataFields.AssertionConsumerService:24:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:24:Location}}
-        {{#metaDataFields.AssertionConsumerService:25:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:25:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:25:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:25:index}}{{^metaDataFields.AssertionConsumerService:25:index}}25{{/metaDataFields.AssertionConsumerService:25:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:25:Location}}
-        {{#metaDataFields.AssertionConsumerService:26:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:26:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:26:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:26:index}}{{^metaDataFields.AssertionConsumerService:26:index}}26{{/metaDataFields.AssertionConsumerService:26:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:26:Location}}
-        {{#metaDataFields.AssertionConsumerService:27:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:27:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:27:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:27:index}}{{^metaDataFields.AssertionConsumerService:27:index}}27{{/metaDataFields.AssertionConsumerService:27:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:27:Location}}
-        {{#metaDataFields.AssertionConsumerService:28:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:28:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:28:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:28:index}}{{^metaDataFields.AssertionConsumerService:28:index}}28{{/metaDataFields.AssertionConsumerService:28:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:28:Location}}
-        {{#metaDataFields.AssertionConsumerService:29:Location}}
-	<md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:29:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:29:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:29:index}}{{^metaDataFields.AssertionConsumerService:29:index}}29{{/metaDataFields.AssertionConsumerService:29:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:29:Location}}
-        {{#metaDataFields.AssertionConsumerService:30:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:30:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:30:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:30:index}}{{^metaDataFields.AssertionConsumerService:30:index}}30{{/metaDataFields.AssertionConsumerService:30:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:30:Location}}
-        {{#AttributeConsumingService}}
-        <md:AttributeConsumingService index="0">
-            {{#metaDataFields.name:en}}
-            <md:ServiceName xml:lang="en">{{metaDataFields.name:en}}</md:ServiceName>
-            {{/metaDataFields.name:en}}
-            {{#metaDataFields.name:nl}}
-            <md:ServiceName xml:lang="nl">{{metaDataFields.name:nl}}</md:ServiceName>
-            {{/metaDataFields.name:nl}}
-            {{#metaDataFields.name:pt}}
-            <md:ServiceName xml:lang="pt">{{metaDataFields.name:pt}}</md:ServiceName>
-            {{/metaDataFields.name:pt}}
-            {{#metaDataFields.description:en}}
-            <md:ServiceDescription xml:lang="en">{{metaDataFields.description:en}}</md:ServiceDescription>
-            {{/metaDataFields.description:en}}
-            {{#metaDataFields.description:nl}}
-            <md:ServiceDescription xml:lang="nl">{{metaDataFields.description:nl}}</md:ServiceDescription>
-            {{/metaDataFields.description:nl}}
-            {{#metaDataFields.description:pt}}
-            <md:ServiceDescription xml:lang="pt">{{metaDataFields.description:pt}}</md:ServiceDescription>
-            {{/metaDataFields.description:pt}}
-            {{#requestedAttributes}}
-            <md:RequestedAttribute Name="{{toString}}"/>
-            {{/requestedAttributes}}
-        </md:AttributeConsumingService>
-        {{/AttributeConsumingService}}
-    </md:SPSSODescriptor>
-    {{#metaDataFields.OrganizationInfo}}
-    <md:Organization>
-        {{#metaDataFields.OrganizationName:en}}
-        <md:OrganizationName xml:lang="en">{{metaDataFields.OrganizationName:en}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:en}}
-        {{#metaDataFields.OrganizationName:nl}}
-        <md:OrganizationName xml:lang="nl">{{metaDataFields.OrganizationName:nl}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:nl}}
-        {{#metaDataFields.OrganizationName:pt}}
-        <md:OrganizationName xml:lang="pt">{{metaDataFields.OrganizationName:pt}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:pt}}
-        {{#metaDataFields.OrganizationDisplayName:en}}
-        <md:OrganizationDisplayName xml:lang="en">{{metaDataFields.OrganizationDisplayName:en}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:en}}
-        {{#metaDataFields.OrganizationDisplayName:nl}}
-        <md:OrganizationDisplayName xml:lang="nl">{{metaDataFields.OrganizationDisplayName:nl}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:nl}}
-        {{#metaDataFields.OrganizationDisplayName:pt}}
-        <md:OrganizationDisplayName xml:lang="pt">{{metaDataFields.OrganizationDisplayName:pt}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:pt}}
-        {{#metaDataFields.OrganizationURL:en}}
-        <md:OrganizationURL xml:lang="en">{{metaDataFields.OrganizationURL:en}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:en}}
-        {{#metaDataFields.OrganizationURL:nl}}
-        <md:OrganizationURL xml:lang="nl">{{metaDataFields.OrganizationURL:nl}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:nl}}
-        {{#metaDataFields.OrganizationURL:pt}}
-        <md:OrganizationURL xml:lang="pt">{{metaDataFields.OrganizationURL:pt}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:pt}}
-    </md:Organization>
-    {{/metaDataFields.OrganizationInfo}}
-    {{#metaDataFields.contacts:0:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:0:contactType}}">
-        {{#metaDataFields.contacts:0:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:0:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:0:givenName}}
-        {{#metaDataFields.contacts:0:surName}}
-        <md:SurName>{{metaDataFields.contacts:0:surName}}</md:SurName>
-        {{/metaDataFields.contacts:0:surName}}
-        {{#metaDataFields.contacts:0:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:0:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:0:emailAddress}}
-        {{#metaDataFields.contacts:0:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:0:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:0:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:0:contactType}}
-    {{#metaDataFields.contacts:1:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:1:contactType}}">
-        {{#metaDataFields.contacts:1:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:1:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:1:givenName}}
-        {{#metaDataFields.contacts:1:surName}}
-        <md:SurName>{{metaDataFields.contacts:1:surName}}</md:SurName>
-        {{/metaDataFields.contacts:1:surName}}
-        {{#metaDataFields.contacts:1:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:1:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:1:emailAddress}}
-        {{#metaDataFields.contacts:1:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:1:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:1:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:1:contactType}}
-    {{#metaDataFields.contacts:2:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:2:contactType}}">
-        {{#metaDataFields.contacts:2:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:2:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:2:givenName}}
-        {{#metaDataFields.contacts:2:surName}}
-        <md:SurName>{{metaDataFields.contacts:2:surName}}</md:SurName>
-        {{/metaDataFields.contacts:2:surName}}
-        {{#metaDataFields.contacts:2:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:2:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:2:emailAddress}}
-        {{#metaDataFields.contacts:2:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:2:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:2:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:2:contactType}}
-    {{#metaDataFields.contacts:3:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:3:contactType}}">
-        {{#metaDataFields.contacts:3:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:3:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:3:givenName}}
-        {{#metaDataFields.contacts:3:surName}}
-        <md:SurName>{{metaDataFields.contacts:3:surName}}</md:SurName>
-        {{/metaDataFields.contacts:3:surName}}
-        {{#metaDataFields.contacts:3:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:3:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:3:emailAddress}}
-        {{#metaDataFields.contacts:3:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:3:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:3:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:3:contactType}}
-
-</md:EntityDescriptor>
diff --git a/roles/manage-server/files/metadata_export_local/single_tenant_template.xml b/roles/manage-server/files/metadata_export_local/single_tenant_template.xml
deleted file mode 100644
index 9f281b666..000000000
--- a/roles/manage-server/files/metadata_export_local/single_tenant_template.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                     entityID="{{entityid}}" validUntil="{{validUntil}}" cacheDuration="PT86400S">
-    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        {{#UIInfoExtension}}
-        <md:Extensions>
-            <mdui:UIInfo>
-                {{#metaDataFields.name:en}}
-                <mdui:DisplayName xml:lang="en">{{metaDataFields.name:en}}</mdui:DisplayName>
-                {{/metaDataFields.name:en}}
-                {{#metaDataFields.name:nl}}
-                <mdui:DisplayName xml:lang="nl">{{metaDataFields.name:nl}}</mdui:DisplayName>
-                {{/metaDataFields.name:nl}}
-                {{#metaDataFields.name:pt}}
-                <mdui:DisplayName xml:lang="pt">{{metaDataFields.name:pt}}</mdui:DisplayName>
-                {{/metaDataFields.name:pt}}
-                {{#metaDataFields.description:en}}
-                <mdui:Description xml:lang="en">{{metaDataFields.description:en}}</mdui:Description>
-                {{/metaDataFields.description:en}}
-                {{#metaDataFields.description:nl}}
-                <mdui:Description xml:lang="nl">{{metaDataFields.description:nl}}</mdui:Description>
-                {{/metaDataFields.description:nl}}
-                {{#metaDataFields.description:pt}}
-                <mdui:Description xml:lang="pt">{{metaDataFields.description:pt}}</mdui:Description>
-                {{/metaDataFields.description:pt}}
-                {{#Logo}}
-                <mdui:Logo width="{{metaDataFields.logo:0:width}}" height="{{metaDataFields.logo:0:height}}" xml:lang="en">{{metaDataFields.logo:0:url}}</mdui:Logo>
-                {{/Logo}}
-            </mdui:UIInfo>
-        </md:Extensions>
-        {{/UIInfoExtension}}
-        {{#metaDataFields.certData}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData}}
-        {{#metaDataFields.certData2}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData2}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData2}}
-        {{#metaDataFields.certData3}}
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>{{metaDataFields.certData3}}</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        {{/metaDataFields.certData3}}
-        {{#metaDataFields.NameIDFormat}}
-        <md:NameIDFormat>{{metaDataFields.NameIDFormat}}</md:NameIDFormat>
-        {{/metaDataFields.NameIDFormat}}
-        {{#metaDataFields.AssertionConsumerService:0:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:0:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:0:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:0:index}}{{^metaDataFields.AssertionConsumerService:0:index}}0{{/metaDataFields.AssertionConsumerService:0:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:0:Location}}
-        {{#metaDataFields.AssertionConsumerService:1:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:1:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:1:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:1:index}}{{^metaDataFields.AssertionConsumerService:1:index}}1{{/metaDataFields.AssertionConsumerService:1:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:1:Location}}
-        {{#metaDataFields.AssertionConsumerService:2:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:2:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:2:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:2:index}}{{^metaDataFields.AssertionConsumerService:2:index}}2{{/metaDataFields.AssertionConsumerService:2:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:2:Location}}
-        {{#metaDataFields.AssertionConsumerService:3:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:3:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:3:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:3:index}}{{^metaDataFields.AssertionConsumerService:3:index}}3{{/metaDataFields.AssertionConsumerService:3:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:3:Location}}
-        {{#metaDataFields.AssertionConsumerService:4:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:4:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:4:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:4:index}}{{^metaDataFields.AssertionConsumerService:4:index}}4{{/metaDataFields.AssertionConsumerService:4:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:4:Location}}
-        {{#metaDataFields.AssertionConsumerService:5:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:5:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:5:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:5:index}}{{^metaDataFields.AssertionConsumerService:5:index}}5{{/metaDataFields.AssertionConsumerService:5:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:5:Location}}
-        {{#metaDataFields.AssertionConsumerService:6:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:6:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:6:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:6:index}}{{^metaDataFields.AssertionConsumerService:6:index}}6{{/metaDataFields.AssertionConsumerService:6:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:6:Location}}
-        {{#metaDataFields.AssertionConsumerService:7:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:7:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:7:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:7:index}}{{^metaDataFields.AssertionConsumerService:7:index}}7{{/metaDataFields.AssertionConsumerService:7:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:7:Location}}
-        {{#metaDataFields.AssertionConsumerService:8:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:8:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:8:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:8:index}}{{^metaDataFields.AssertionConsumerService:8:index}}8{{/metaDataFields.AssertionConsumerService:8:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:8:Location}}
-        {{#metaDataFields.AssertionConsumerService:9:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:9:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:9:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:9:index}}{{^metaDataFields.AssertionConsumerService:9:index}}9{{/metaDataFields.AssertionConsumerService:9:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:9:Location}}
-        {{#metaDataFields.AssertionConsumerService:10:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:10:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:10:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:10:index}}{{^metaDataFields.AssertionConsumerService:10:index}}10{{/metaDataFields.AssertionConsumerService:10:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:10:Location}}
-        {{#metaDataFields.AssertionConsumerService:11:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:11:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:11:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:11:index}}{{^metaDataFields.AssertionConsumerService:11:index}}11{{/metaDataFields.AssertionConsumerService:11:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:11:Location}}
-        {{#metaDataFields.AssertionConsumerService:12:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:12:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:12:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:12:index}}{{^metaDataFields.AssertionConsumerService:12:index}}12{{/metaDataFields.AssertionConsumerService:12:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:12:Location}}
-        {{#metaDataFields.AssertionConsumerService:13:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:13:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:13:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:13:index}}{{^metaDataFields.AssertionConsumerService:13:index}}13{{/metaDataFields.AssertionConsumerService:13:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:13:Location}}
-        {{#metaDataFields.AssertionConsumerService:14:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:14:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:14:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:14:index}}{{^metaDataFields.AssertionConsumerService:14:index}}14{{/metaDataFields.AssertionConsumerService:14:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:14:Location}}
-        {{#metaDataFields.AssertionConsumerService:15:Location}}
-        <md:AssertionConsumerService Binding="{{metaDataFields.AssertionConsumerService:15:Binding}}"
-                                     Location="{{metaDataFields.AssertionConsumerService:15:Location}}"
-                                     index="{{metaDataFields.AssertionConsumerService:15:index}}{{^metaDataFields.AssertionConsumerService:15:index}}15{{/metaDataFields.AssertionConsumerService:15:index}}"/>
-        {{/metaDataFields.AssertionConsumerService:15:Location}}
-        {{#AttributeConsumingService}}
-        <md:AttributeConsumingService index="0">
-            {{#metaDataFields.name:en}}
-            <md:ServiceName xml:lang="en">{{metaDataFields.name:en}}</md:ServiceName>
-            {{/metaDataFields.name:en}}
-            {{#metaDataFields.name:nl}}
-            <md:ServiceName xml:lang="nl">{{metaDataFields.name:nl}}</md:ServiceName>
-            {{/metaDataFields.name:nl}}
-            {{#metaDataFields.name:pt}}
-            <md:ServiceName xml:lang="pt">{{metaDataFields.name:pt}}</md:ServiceName>
-            {{/metaDataFields.name:pt}}
-            {{#metaDataFields.description:en}}
-            <md:ServiceDescription xml:lang="en">{{metaDataFields.description:en}}</md:ServiceDescription>
-            {{/metaDataFields.description:en}}
-            {{#metaDataFields.description:nl}}
-            <md:ServiceDescription xml:lang="nl">{{metaDataFields.description:nl}}</md:ServiceDescription>
-            {{/metaDataFields.description:nl}}
-            {{#metaDataFields.description:pt}}
-            <md:ServiceDescription xml:lang="pt">{{metaDataFields.description:pt}}</md:ServiceDescription>
-            {{/metaDataFields.description:pt}}
-            {{#requestedAttributes}}
-            <md:RequestedAttribute Name="{{toString}}"/>
-            {{/requestedAttributes}}
-        </md:AttributeConsumingService>
-        {{/AttributeConsumingService}}
-    </md:SPSSODescriptor>
-    {{#metaDataFields.OrganizationInfo}}
-    <md:Organization>
-        {{#metaDataFields.OrganizationName:en}}
-        <md:OrganizationName xml:lang="en">{{metaDataFields.OrganizationName:en}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:en}}
-        {{#metaDataFields.OrganizationName:nl}}
-        <md:OrganizationName xml:lang="nl">{{metaDataFields.OrganizationName:nl}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:nl}}
-        {{#metaDataFields.OrganizationName:pt}}
-        <md:OrganizationName xml:lang="pt">{{metaDataFields.OrganizationName:pt}}</md:OrganizationName>
-        {{/metaDataFields.OrganizationName:pt}}
-        {{#metaDataFields.OrganizationDisplayName:en}}
-        <md:OrganizationDisplayName xml:lang="en">{{metaDataFields.OrganizationDisplayName:en}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:en}}
-        {{#metaDataFields.OrganizationDisplayName:nl}}
-        <md:OrganizationDisplayName xml:lang="nl">{{metaDataFields.OrganizationDisplayName:nl}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:nl}}
-        {{#metaDataFields.OrganizationDisplayName:pt}}
-        <md:OrganizationDisplayName xml:lang="pt">{{metaDataFields.OrganizationDisplayName:pt}}</md:OrganizationDisplayName>
-        {{/metaDataFields.OrganizationDisplayName:pt}}
-        {{#metaDataFields.OrganizationURL:en}}
-        <md:OrganizationURL xml:lang="en">{{metaDataFields.OrganizationURL:en}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:en}}
-        {{#metaDataFields.OrganizationURL:nl}}
-        <md:OrganizationURL xml:lang="nl">{{metaDataFields.OrganizationURL:nl}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:nl}}
-        {{#metaDataFields.OrganizationURL:pt}}
-        <md:OrganizationURL xml:lang="pt">{{metaDataFields.OrganizationURL:pt}}</md:OrganizationURL>
-        {{/metaDataFields.OrganizationURL:pt}}
-    </md:Organization>
-    {{/metaDataFields.OrganizationInfo}}
-    {{#metaDataFields.contacts:0:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:0:contactType}}">
-        {{#metaDataFields.contacts:0:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:0:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:0:givenName}}
-        {{#metaDataFields.contacts:0:surName}}
-        <md:SurName>{{metaDataFields.contacts:0:surName}}</md:SurName>
-        {{/metaDataFields.contacts:0:surName}}
-        {{#metaDataFields.contacts:0:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:0:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:0:emailAddress}}
-        {{#metaDataFields.contacts:0:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:0:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:0:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:0:contactType}}
-    {{#metaDataFields.contacts:1:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:1:contactType}}">
-        {{#metaDataFields.contacts:1:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:1:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:1:givenName}}
-        {{#metaDataFields.contacts:1:surName}}
-        <md:SurName>{{metaDataFields.contacts:1:surName}}</md:SurName>
-        {{/metaDataFields.contacts:1:surName}}
-        {{#metaDataFields.contacts:1:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:1:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:1:emailAddress}}
-        {{#metaDataFields.contacts:1:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:1:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:1:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:1:contactType}}
-    {{#metaDataFields.contacts:2:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:2:contactType}}">
-        {{#metaDataFields.contacts:2:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:2:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:2:givenName}}
-        {{#metaDataFields.contacts:2:surName}}
-        <md:SurName>{{metaDataFields.contacts:2:surName}}</md:SurName>
-        {{/metaDataFields.contacts:2:surName}}
-        {{#metaDataFields.contacts:2:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:2:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:2:emailAddress}}
-        {{#metaDataFields.contacts:2:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:2:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:2:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:2:contactType}}
-    {{#metaDataFields.contacts:3:contactType}}
-    <md:ContactPerson contactType="{{metaDataFields.contacts:3:contactType}}">
-        {{#metaDataFields.contacts:3:givenName}}
-        <md:GivenName>{{metaDataFields.contacts:3:givenName}}</md:GivenName>
-        {{/metaDataFields.contacts:3:givenName}}
-        {{#metaDataFields.contacts:3:surName}}
-        <md:SurName>{{metaDataFields.contacts:3:surName}}</md:SurName>
-        {{/metaDataFields.contacts:3:surName}}
-        {{#metaDataFields.contacts:3:emailAddress}}
-        <md:EmailAddress>mailto:{{metaDataFields.contacts:3:emailAddress}}</md:EmailAddress>
-        {{/metaDataFields.contacts:3:emailAddress}}
-        {{#metaDataFields.contacts:3:telephoneNumber}}
-        <md:TelephoneNumber>{{metaDataFields.contacts:3:telephoneNumber}}</md:TelephoneNumber>
-        {{/metaDataFields.contacts:3:telephoneNumber}}
-    </md:ContactPerson>
-    {{/metaDataFields.contacts:3:contactType}}
-
-</md:EntityDescriptor>
diff --git a/roles/manage-server/tasks/main.yml b/roles/manage-server/tasks/main.yml
index 4a7bda8db..c58a5d64b 100644
--- a/roles/manage-server/tasks/main.yml
+++ b/roles/manage-server/tasks/main.yml
@@ -19,7 +19,6 @@
     mode: 0740
   with_items:
     - "{{ manage_dir }}/metadata_configuration"
-    - "{{ manage_dir }}/metadata_export"
     - "{{ manage_dir }}/metadata_templates"
 
 - name: copy application config
@@ -63,18 +62,6 @@
   notify:
     - "restart manage"
 
-- name: copy metadata export
-  copy:
-    src: "{{ item }}"
-    dest: "{{ manage_dir }}"
-    owner: manage
-    group: manage
-    mode: "0640"
-  with_items:
-    - metadata_export
-  notify:
-    - "restart manage"
-
 - name: copy / create certificate
   copy:
     src: "{{ inventory_dir }}/files/certs/invite/public_key.pem"
diff --git a/roles/manage-server/templates/application.yml.j2 b/roles/manage-server/templates/application.yml.j2
index 940908db0..69b547fee 100644
--- a/roles/manage-server/templates/application.yml.j2
+++ b/roles/manage-server/templates/application.yml.j2
@@ -51,7 +51,6 @@ product:
 
 metadata_configuration_path: file://{{ manage_dir }}/metadata_configuration
 metadata_templates_path: file://{{ manage_dir }}/metadata_templates
-metadata_export_path: file://{{ manage_dir }}/metadata_export
 
 security:
   backdoor_user_name: {{ manage.backdoor_api_user }}