Hi.. With the improvements Johan applied to the get-FederationDefaults helper, a single endpoint can contain multiple federations settings. I was working with both InCommon in a ticket and in slack with IDEM (Italy) settings for their test federation and went and configured them as well in the settings file. The repo can be found here: https://github.com/fedtools/federation-settings This is from my work location in my @teamktown  github account so I’m not sure how up to date the SWAMID snapshot is. I suspect it is not the latest appropriate one. Please feel free to update it. It’s also specifically named neutrally so it can be used for more than just ADFSToolkit for federation settings like these. The ADFSToolkit docs in  step 1 of the install are updated (here: https://github.com/fedtools/adfstoolkit/blob/master/doc/README.md ) to use this zip off the main branch. We may want to consider releases on  it as I suspect others will want to set up their own for their federation as pull requests.  Chris..