Moved files to make ths repo signed

772 files changed, 624 insertions, 269 deletions

diff --git a/.gitignore b/.gitignore
index 43def0be..d95d1717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,9 @@
-swamid-sp-1.0.xml
-swamid-idp-1.0.xml
-swamid-interfederations-1.0
-swamid-interfederations-2.0
-swamid-interfederations-idp-2.0.xml
-swamid-interfederations-sp-2.0.xml
-*.tbs
-*.n
-.cache
-swamid-interfederations-1.0*
-swamid-interfederations-2.0*
-.time/*
-sp-with-once-ok-coco-link
+metadata/swamid-interfederations-2.0
+metadata/swamid-interfederations-idp-2.0.xml
+metadata/swamid-interfederations-sp-2.0.xml
+metadata/*.tbs
+metadata/*.n
+metadata/.cache
+metadata/swamid-interfederations-2.0*
+metadata/.time/*
+metadata/sp-with-once-ok-coco-link
diff --git a/Makefile b/Makefile
index 140e235f..a4e5b77d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,261 +1,17 @@
+tag:    commit
+	./scripts/bump-tag
 
-KEY  := /opt/swamid-credentials/swamid-signer.key
-CERT := /opt/swamid-credentials/swamid-signer.crt
-PASS := $(shell test -f /opt/swamid-credentials/swamid-signer-pass.txt && cat /opt/swamid-credentials/swamid-signer-pass.txt)
-DEST := /opt/published-metadata
-SRCDIRS=swamid-2.0 swamid-edugain swamid-testing
+boostrap-trust:
+	./scripts/update-trust
 
-DAYS:=15
-DATE=$(shell perl scripts/expiration_date.pl $(DAYS))
-NOW=$(shell perl scripts/now_date.pl)
-RPI=false
-CONTACTS=false
-TOU=true
-ORG=true
-TRANSFORM=xslt/normalize.xsl
-ID=$(shell perl scripts/unique_id.pl)
-XSLTDEFS := --stringparam org $(ORG) --stringparam ID $(ID) --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE) --stringparam now $(NOW)
-SIGNER := xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS) --id-attr:ID urn:oasis:names:tc:SAML:2.0:metadata:EntitiesDescriptor
-BASEURL := http://md.swamid.se/md
-SIGN := xslt/sign.xsl
-SITE := site/md.swamid.se
-TOU  := swamid-tou-en.txt swamid-tou-sv.txt
+update: update-git
+	./scripts/verify-tag && ./scripts/update-trust && rsync -avz --exclude .time --delete metadata/ /opt/metadata/
 
--include $(SWAMID_MK_CONFIG)
+update-git:
+	git checkout master && git reset --hard && git pull
 
-all: clean dependencies signtest sign clean web
+test:
+	cd metadata ; make test
 
-MXML=$(shell echo *.mxml)
-EDUGAINXML=$(patsubst swamid-edugain/%.xml,.time/%.time,$(wildcard swamid-edugain/*.xml))
-SWAMID20XML=$(patsubst swamid-2.0/%.xml,.time/%.time,$(wildcard swamid-2.0/*.xml))
-TESTINGXML=$(patsubst swamid-testing/%.xml,.time/%.time,$(wildcard swamid-testing/*.xml))
-
-sign: swamid upstream
-
-%.sig: %.mxml
-	xsltproc $(XSLTDEFS) --stringparam target "$(BASEURL)/$*.xml" --xinclude $(TRANSFORM) $< > $*.n
-	xsltproc $(XSLTDEFS) --xinclude $(SIGN) $*.n > $*.tbs
-	$(SIGNER) --output $@ $*.tbs
-	xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $@
-	rm -f $*.tbs $*.n
-
-%.pub: %.sig
-	mkdir -p $(DEST) && xmllint --nowarning --noout --path schema --schema schema.xsd $< && mv $< $(DEST)/$*.xml
-
-dependencies:  swamid-interfederations-idp-2.0.xml swamid-interfederations-sp-2.0.xml
-
-upstream: edugain
-
-edugain:
-	env SWAMID_MK_CONFIG=$(SWAMID_MK_CONFIG) $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
-
-aggregate: swamid-interfederations
-
-swamid-interfederations: swamid-interfederations2
-
-swamid-interfederations2:
-	scripts/aggregate.sh swamid-interfederations-2.0
-	@# Blocked by SWAMID-OPS 2021-04-21
-	@sed -i '/services.sheerid.com-Shibboleth-UK/d' swamid-interfederations-2.0.mxml
-	@# Blocked by SWAMID-OPS 2021-12-10 SWAMID-550
-	@sed -i '/verify-a.myunidays.com-shibboleth/d' swamid-interfederations-2.0.mxml
-	@sed -i '/verify-l.myunidays.com-shibboleth/d' swamid-interfederations-2.0.mxml
-	@sed -i '/mecenat.com-sp/d' swamid-interfederations-2.0.mxml
-	@sed -i '/connect.mecenat.com-shibboleth/d' swamid-interfederations-2.0.mxml
-	@sed -i '/verify.studentbeans.com-shibboleth/d' swamid-interfederations-2.0.mxml
-	@sed -i '/federation.proxi.id-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge/d' swamid-interfederations-2.0.mxml
-	@# Blocked by SWAMID-OPS 2022-04-14 SWAMID-837
-	@sed -i '/access-check.edugain.org-simplesaml-saml2-idp-metadata.php/d' swamid-interfederations-2.0.mxml
-	@# Blocked by SWAMID-OPS 2022-04-25 SWAMID-854
-	@sed -i '/potential.ly/d' swamid-interfederations-2.0.mxml
-	@# Blocked 2022-09-23 , Invalid XML, Unlocked 2022-09-27 // Bjorn
-	@#sed -i '/idp.ici.ro-idp-shibboleth.xml/d' swamid-interfederations-2.0.mxml
-
-swamid: swamid-2.0.pub swamid-discovery.pub swamid-idp.pub swamid-idp-transitive.pub swamid-sp-transitive.pub swamid-registered.pub swamid-testing-1.0.pub swamid-testing-idp-1.0.pub
-
-web: $(SITE) $(TOU)
-	rsync -avz $(TOU) $(SITE)/ $(DEST)
-
-swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml
-	@xsltproc --xinclude xslt/extract-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-idp-2.0.xml
-	@# Empty PrivacyStatementURL 2020-12-09
-	@#sed -i '/sso.irc.ugent.be-auth-realms-irc/d' swamid-interfederations-idp-2.0.xml
-	@# Empty ds:KeyName 2021-03-26
-	@#sed -i '/idp.kre.hu-simplesaml-saml2-idp-metadata/d' swamid-interfederations-idp-2.0.xml
-	@#sed -i '/idp.kre.hu-simplesaml-saml2-idp-metadata/d' swamid-interfederations-2.0.mxml
-
-swamid-interfederations-sp-2.0.xml: swamid-interfederations-2.0.mxml
-	@xsltproc --xinclude xslt/extract-sp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-sp-2.0.xml
-
-syntaxtest: clean dependencies schematest
-
-pedantic: clean dependencies schematest testRefedsRnS testEduGAINchecks
-
-schematest:
-	@fail=false ; for x in $(MXML); do test=`xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x 2>&1`; rc=$$?; echo $$test | sed 's/fails to validate/&/;s/validates/&/'; if [ $$rc -gt 0 ]; then fail=true ; fi; done ; if $$fail ; then exit 1 ; fi
-
-clean:
-	@rm -f *.xml *.tbs *.n *.sig
-
-tidy:
-	@for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $$x > $$x.c && mv $$x.c $$x; done
-	@for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done
-
-testRefedsRnS:
-	@echo "Checking for refeds R&S compatibillity for entities exported to eduGAIN"
-	@for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \
-	got_refeds_RnS=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions/EntityAttributes/Attribute[@Name='http://macedir.org/entity-category']/AttributeValue" - 2>/dev/null | grep 'http://refeds.org/category/research-and-scholarship'` ; \
-	if [ -n "$$got_refeds_RnS" ] ; then \
-	http_post=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/AssertionConsumerService" - 2>/dev/null | grep 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'` ; \
-	if [ -z "$$http_post" ] ; then echo "  $$x: Missing HTTP-POST binding." | sed 's/.*/&/' ; fi ; \
-	mdui_DisplayName=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/DisplayName" - 2>/dev/null | grep 'DisplayName'` ; \
-	if [ -z "$$mdui_DisplayName" ] ; then echo "  $$x: Missing mdui:DisplayName." | sed 's/.*/&/' ; fi ; \
-	mdui_InformationURL=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/InformationURL" - 2>/dev/null | grep 'InformationURL'` ; \
-	if [ -z "$$mdui_InformationURL" ] ; then echo "  $$x: Missing mdui:InformationURL." | sed 's/.*/&/' ; fi ; \
-	tech_contact=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/ContactPerson[@contactType='technical']" - 2>/dev/null | grep 'EmailAddress'` ; \
-	if [ -z "$$tech_contact" ] ; then echo "  $$x: Missing ContactPerson contactType='technical'." | sed 's/.*/&/' ; fi ; \
-	fi ; \
-	done
-
-testEduGAINchecks:
-	@echo "Checking for attributes not allowed in entities exported to eduGAIN"
-	@for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \
-		if ( grep -q "AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" $$x ); then \
-			echo "  $$x: AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect\" not allowed";  \
-		fi ;  \
-	done
-	@for x in `cat swamid-edugain-idp-1.0.mxml swamid-edugain-sp-1.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do \
-		sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationName' - 2>/dev/null | grep -vq "^$$" || echo "  $$x missing OrganizationName" | sed 's/.*/&/' ; \
-		sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationDisplayName' - 2>/dev/null | grep -vq "^$$" || echo "  $$x missing OrganizationDisplayName" | sed 's/.*/&/' ; \
-		sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationURL' - 2>/dev/null | grep -vq "^$$" || echo "  $$x missing OrganizationURL" | sed 's/.*/&/' ; \
-	done
-
-
-testMDUI:
-	@echo "Checking for uniq IdP MDUI DisplayName"
-	@for lang in `find $(SRCDIRS) -name \*.xml -exec cat {} \; | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[       ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;  $$x $$lang ;" | sed 's/.*/&/' ; done | sort -k 3 | uniq -d -f 2 ; done | grep . && exit 1 || true
-
-testIdPinSP:
-	@echo "Check that SP:s does not define IDPSSODescriptor"
-	@for spfile in `cat swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo "  $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0
-
-testMDUIreach:
-	@echo "Check that MDUI URLs are reachable"
-	@cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \
-	xargs -n1 -P 10 scripts/verify-uiinfo-urls.sh
-
-testALlevel:
-	@echo Fixa så att vi kollar!!!!!
-	@echo "Check for IdP:s with AL3 without AL2"
-	@for x in `find $(SRCDIRS) -name \*.xml`; do if grep -q http://www.swamid.se/policy/assurance/al3 $$x && ! grep -q http://www.swamid.se/policy/assurance/al2 $$x ; then echo "  $$x" | sed 's/.*/&/' ; fi ; done
-	@echo "Check for IdP:s with AL2 without AL1"
-	@for x in `find $(SRCDIRS) -name \*.xml`; do if grep -q http://www.swamid.se/policy/assurance/al2 $$x && ! grep -q http://www.swamid.se/policy/assurance/al1 $$x ; then echo "  $$x" | sed 's/.*/&/' ; fi ; done
-
-testBadStrings:
-	@echo "Check for bad strings in metadata"
-	@for x in `find $(SRCDIRS) -name \*.xml`; do grep -E 'ServiceName xml:lang="[^"]*"/>' $$x | sed 's/^/  /' ; done | grep . && exit 1 || exit 0
-
-testRoleDescriptor:
-
-testRegistrationAuthority:
-	@echo "Check for registrationAuthority="http://www.swamid.se/" in EntityDescriptor/Extensions"
-	@for x in `find $(SRCDIRS) -name \*.xml`; do \
-		if ! cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions" - 2>/dev/null | grep -qE 'registrationAuthority="http://www.swamid.se/"|registrationAuthority="http://www.swamid.se/loop"' ; then \
-			echo "  $$x" | sed 's/.*/&/' ;\
-		fi;\
-	done | grep . && exit 1 || exit 0
-
-checkInvalidChars:
-	@echo "Check for invalid characters"
-	@for x in `find $(SRCDIRS) -name \*.xml`; do \
-		if grep -q "&#13;" $$x ; then \
-			echo "  $$x" | sed 's/.*/&/' ;\
-		fi;\
-	done | grep . && exit 1 || exit 0
-
-checkUKalgorithms:
-	@echo "Check for invalid algorithms in swamid-edugain"
-	@xsltproc --xinclude xslt/check_uk_algorithms.xsl swamid-edugain-1.0.mxml 2>&1 | sed 's/.*/&/' | grep . && exit 1 || exit 0
-
-createMXMLfiles:
-	@echo Recreating MXML files
-	@scripts/create_mxml.sh | sed 's/.*/&/' | grep . && exit 1 || exit 0
-
-signtest: syntaxtest testMDUI testALlevel testEduGAINchecks testRefedsRnS testBadStrings testIdPinSP testRegistrationAuthority checkInvalidChars checkUKalgorithms
-test: createMXMLfiles signtest
-
-test2: $(EDUGAINXML) $(SWAMID20XML) $(TESTINGXML) test
-
-.time/%.time: swamid-edugain/%.xml
-	@# make tidy
-	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
-	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
-
-	@# make schematest
-	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
-
-	@echo $< done
-	@touch -r $< $@
-
-.time/%.time: swamid-2.0/%.xml
-	@# make tidy
-	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
-	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
-
-	@# make schematest
-	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
-
-	@echo $< done
-	@touch -r $< $@
-
-.time/%.time: swamid-testing/%.xml
-	@# make tidy
-	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
-	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
-
-	@# make schematest
-	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
-
-	@echo $< done
-	@touch -r $< $@
-
-old_check:
-	@# make testMDUI
-	@#echo "Checking for bad lang codes"
-	@# Lang = ISO_639-1
-	@#cat $< | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv|no|nn|nb|is' | sed 's/.*/Bad lang code : &/' | grep . && exit 1 || true
-	@#if [ `grep EntityAttributes $< | wc -l ` -gt 2 ]; then echo "Multiple EntityAttributes" | sed 's/.*/&/' ; exit 1; fi
-	@#if ( grep -q IDPSSODescriptor $< ) ; then \
-		#echo "Do IdP checks" ;  \
-		#echo ">Checking for uniq IdP MDUI DisplayName"; \
-		#for lang in `cat $< | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do \
-			#mdui_displayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[         ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'`;\
-			 #organizationdisplayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[     ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ;\
-			#for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor | egrep -v $<` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | egrep "^$$mdui_displayname$$" | sed "s;^;Duplicate DisplayName in $$x for lang =  $$lang\n;" | sed 's/.*/&/' ; done | grep . && exit 1 || true;\
-		#done; \
-		#echo ">Checking for invalid IPHint"; \
-		#cat $< | sed -n 's;.*<[a-z0-9:]*IPHint>\(.*\)</[a-z0-9:]*IPHint>;\1;p' | grep -vE '^$$|^[0-9./a-fA-F:]*$$' | sed 's/.*/&/'; \
-		#echo ">Checking for invalid geodata (syntax is geo:xx.yy,zz.vv)";\
-		#cat $< | sed -n 's;.*<[a-z0-9:]*GeolocationHint>\(.*\)</[a-z0-9:]*GeolocationHint>;\1;p' | grep -vE '^$$|^geo:[0-9][0-9][0-9.]*,[0-9][0-9][0-9.]*$$' | sed 's/.*/&/' ; \
-		#echo ">Check for IdP:s with Logos over http";\
-		#cat $< | grep 'Logo .*http://' | sed 's/.*>\(.*\)<.*/\1/' | grep . && exit 1 || exit 0 ; \
-	#fi
-
-
-deeptest: test testMDUIreach
-
-commit2: test2
-	@git diff --color || true
-	@echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
-	@git status -u
-	@echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/|^swamid-testing/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi
-	@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
-	@git push
-
-commit: tidy test
-	@git diff --color || true
-	@echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
-	@git status -u
-	@echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/|^swamid-testing/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi
-	@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
-	@git push
+commit:
+	cd metadata ; make commit
diff --git a/keys/bjorn-8E2DA8EB05F646D7.pub b/keys/bjorn-8E2DA8EB05F646D7.pub
new file mode 100644
index 00000000..812bdb0f
--- /dev/null
+++ b/keys/bjorn-8E2DA8EB05F646D7.pub
@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=OCI3
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/keys/jocar-BE4EC2EEADF2C31B.pub b/keys/jocar-BE4EC2EEADF2C31B.pub
new file mode 100644
index 00000000..b51c181b
--- /dev/null
+++ b/keys/jocar-BE4EC2EEADF2C31B.pub
@@ -0,0 +1,86 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=Rrn+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/keys/ps-7D8D73B5.pub b/keys/ps-7D8D73B5.pub
new file mode 100644
index 00000000..1bc37e0e
--- /dev/null
+++ b/keys/ps-7D8D73B5.pub
@@ -0,0 +1,75 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+CpfCesknuQ==
+=RFc+
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/metadata/Makefile b/metadata/Makefile
new file mode 100644
index 00000000..8149bdd6
--- /dev/null
+++ b/metadata/Makefile
@@ -0,0 +1,257 @@
+
+KEY  := /opt/swamid-credentials/swamid-signer.key
+CERT := /opt/swamid-credentials/swamid-signer.crt
+PASS := $(shell test -f /opt/swamid-credentials/swamid-signer-pass.txt && cat /opt/swamid-credentials/swamid-signer-pass.txt)
+DEST := /opt/published-metadata
+SRCDIRS=swamid-2.0 swamid-edugain swamid-testing
+
+DAYS:=15
+DATE=$(shell perl scripts/expiration_date.pl $(DAYS))
+NOW=$(shell perl scripts/now_date.pl)
+RPI=false
+CONTACTS=false
+TOU=true
+ORG=true
+TRANSFORM=xslt/normalize.xsl
+ID=$(shell perl scripts/unique_id.pl)
+XSLTDEFS := --stringparam org $(ORG) --stringparam ID $(ID) --stringparam tou $(TOU) --stringparam rpi $(RPI) --stringparam defaultContact $(CONTACTS) --stringparam date $(DATE) --stringparam now $(NOW)
+SIGNER := xmlsec1 --sign --privkey-pem $(KEY),$(CERT) --pwd $(PASS) --id-attr:ID urn:oasis:names:tc:SAML:2.0:metadata:EntitiesDescriptor
+BASEURL := http://md.swamid.se/md
+SIGN := xslt/sign.xsl
+SITE := site/md.swamid.se
+TOU  := swamid-tou-en.txt swamid-tou-sv.txt
+
+-include $(SWAMID_MK_CONFIG)
+
+all: clean dependencies signtest sign clean web
+
+MXML=$(shell echo *.mxml)
+EDUGAINXML=$(patsubst swamid-edugain/%.xml,.time/%.time,$(wildcard swamid-edugain/*.xml))
+SWAMID20XML=$(patsubst swamid-2.0/%.xml,.time/%.time,$(wildcard swamid-2.0/*.xml))
+TESTINGXML=$(patsubst swamid-testing/%.xml,.time/%.time,$(wildcard swamid-testing/*.xml))
+
+sign: swamid upstream
+
+%.sig: %.mxml
+	xsltproc $(XSLTDEFS) --stringparam target "$(BASEURL)/$*.xml" --xinclude $(TRANSFORM) $< > $*.n
+	xsltproc $(XSLTDEFS) --xinclude $(SIGN) $*.n > $*.tbs
+	$(SIGNER) --output $@ $*.tbs
+	xmllint --xinclude --nowarning --noout --path schema --schema  schema.xsd $@
+	rm -f $*.tbs $*.n
+
+%.pub: %.sig
+	mkdir -p $(DEST) && xmllint --nowarning --noout --path schema --schema schema.xsd $< && mv $< $(DEST)/$*.xml
+
+dependencies:  swamid-interfederations-idp-2.0.xml swamid-interfederations-sp-2.0.xml
+
+upstream: edugain
+
+edugain:
+	env SWAMID_MK_CONFIG=$(SWAMID_MK_CONFIG) $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub
+
+aggregate: swamid-interfederations
+
+swamid-interfederations: swamid-interfederations2
+
+swamid-interfederations2:
+	scripts/aggregate.sh swamid-interfederations-2.0
+	@# Blocked by SWAMID-OPS 2021-04-21
+	@sed -i '/services.sheerid.com-Shibboleth-UK/d' swamid-interfederations-2.0.mxml
+	@# Blocked by SWAMID-OPS 2021-12-10 SWAMID-550
+	@sed -i '/verify-a.myunidays.com-shibboleth/d' swamid-interfederations-2.0.mxml
+	@sed -i '/verify-l.myunidays.com-shibboleth/d' swamid-interfederations-2.0.mxml
+	@sed -i '/mecenat.com-sp/d' swamid-interfederations-2.0.mxml
+	@sed -i '/connect.mecenat.com-shibboleth/d' swamid-interfederations-2.0.mxml
+	@sed -i '/verify.studentbeans.com-shibboleth/d' swamid-interfederations-2.0.mxml
+	@sed -i '/federation.proxi.id-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge/d' swamid-interfederations-2.0.mxml
+	@# Blocked by SWAMID-OPS 2022-04-14 SWAMID-837
+	@sed -i '/access-check.edugain.org-simplesaml-saml2-idp-metadata.php/d' swamid-interfederations-2.0.mxml
+	@# Blocked by SWAMID-OPS 2022-04-25 SWAMID-854
+	@sed -i '/potential.ly/d' swamid-interfederations-2.0.mxml
+	@# Blocked 2022-09-23 , Invalid XML, Unlocked 2022-09-27 // Bjorn
+	@#sed -i '/idp.ici.ro-idp-shibboleth.xml/d' swamid-interfederations-2.0.mxml
+
+swamid: swamid-2.0.pub swamid-discovery.pub swamid-idp.pub swamid-idp-transitive.pub swamid-sp-transitive.pub swamid-registered.pub swamid-testing-1.0.pub swamid-testing-idp-1.0.pub
+
+web: $(SITE) $(TOU)
+	rsync -avz $(TOU) $(SITE)/ $(DEST)
+
+swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml
+	@xsltproc --xinclude xslt/extract-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-idp-2.0.xml
+	@# Empty PrivacyStatementURL 2020-12-09
+	@#sed -i '/sso.irc.ugent.be-auth-realms-irc/d' swamid-interfederations-idp-2.0.xml
+	@# Empty ds:KeyName 2021-03-26
+	@#sed -i '/idp.kre.hu-simplesaml-saml2-idp-metadata/d' swamid-interfederations-idp-2.0.xml
+	@#sed -i '/idp.kre.hu-simplesaml-saml2-idp-metadata/d' swamid-interfederations-2.0.mxml
+
+swamid-interfederations-sp-2.0.xml: swamid-interfederations-2.0.mxml
+	@xsltproc --xinclude xslt/extract-sp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-sp-2.0.xml
+
+syntaxtest: clean dependencies schematest
+
+pedantic: clean dependencies schematest testRefedsRnS testEduGAINchecks
+
+schematest:
+	@fail=false ; for x in $(MXML); do test=`xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x 2>&1`; rc=$$?; echo $$test | sed 's/fails to validate/&/;s/validates/&/'; if [ $$rc -gt 0 ]; then fail=true ; fi; done ; if $$fail ; then exit 1 ; fi
+
+clean:
+	@rm -f *.xml *.tbs *.n *.sig
+
+tidy:
+	@for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $$x > $$x.c && mv $$x.c $$x; done
+	@for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done
+
+testRefedsRnS:
+	@echo "Checking for refeds R&S compatibillity for entities exported to eduGAIN"
+	@for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \
+	got_refeds_RnS=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions/EntityAttributes/Attribute[@Name='http://macedir.org/entity-category']/AttributeValue" - 2>/dev/null | grep 'http://refeds.org/category/research-and-scholarship'` ; \
+	if [ -n "$$got_refeds_RnS" ] ; then \
+	http_post=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/AssertionConsumerService" - 2>/dev/null | grep 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'` ; \
+	if [ -z "$$http_post" ] ; then echo "  $$x: Missing HTTP-POST binding." | sed 's/.*/&/' ; fi ; \
+	mdui_DisplayName=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/DisplayName" - 2>/dev/null | grep 'DisplayName'` ; \
+	if [ -z "$$mdui_DisplayName" ] ; then echo "  $$x: Missing mdui:DisplayName." | sed 's/.*/&/' ; fi ; \
+	mdui_InformationURL=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/InformationURL" - 2>/dev/null | grep 'InformationURL'` ; \
+	if [ -z "$$mdui_InformationURL" ] ; then echo "  $$x: Missing mdui:InformationURL." | sed 's/.*/&/' ; fi ; \
+	tech_contact=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/ContactPerson[@contactType='technical']" - 2>/dev/null | grep 'EmailAddress'` ; \
+	if [ -z "$$tech_contact" ] ; then echo "  $$x: Missing ContactPerson contactType='technical'." | sed 's/.*/&/' ; fi ; \
+	fi ; \
+	done
+
+testEduGAINchecks:
+	@echo "Checking for attributes not allowed in entities exported to eduGAIN"
+	@for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \
+		if ( grep -q "AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" $$x ); then \
+			echo "  $$x: AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect\" not allowed";  \
+		fi ;  \
+	done
+	@for x in `cat swamid-edugain-idp-1.0.mxml swamid-edugain-sp-1.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do \
+		sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationName' - 2>/dev/null | grep -vq "^$$" || echo "  $$x missing OrganizationName" | sed 's/.*/&/' ; \
+		sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationDisplayName' - 2>/dev/null | grep -vq "^$$" || echo "  $$x missing OrganizationDisplayName" | sed 's/.*/&/' ; \
+		sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationURL' - 2>/dev/null | grep -vq "^$$" || echo "  $$x missing OrganizationURL" | sed 's/.*/&/' ; \
+	done
+
+
+testMDUI:
+	@echo "Checking for uniq IdP MDUI DisplayName"
+	@for lang in `find $(SRCDIRS) -name \*.xml -exec cat {} \; | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[       ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | sed "s;^;  $$x $$lang ;" | sed 's/.*/&/' ; done | sort -k 3 | uniq -d -f 2 ; done | grep . && exit 1 || true
+
+testIdPinSP:
+	@echo "Check that SP:s does not define IDPSSODescriptor"
+	@for spfile in `cat swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo "  $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0
+
+testMDUIreach:
+	@echo "Check that MDUI URLs are reachable"
+	@cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \
+	xargs -n1 -P 10 scripts/verify-uiinfo-urls.sh
+
+testALlevel:
+	@echo Fixa så att vi kollar!!!!!
+	@echo "Check for IdP:s with AL3 without AL2"
+	@for x in `find $(SRCDIRS) -name \*.xml`; do if grep -q http://www.swamid.se/policy/assurance/al3 $$x && ! grep -q http://www.swamid.se/policy/assurance/al2 $$x ; then echo "  $$x" | sed 's/.*/&/' ; fi ; done
+	@echo "Check for IdP:s with AL2 without AL1"
+	@for x in `find $(SRCDIRS) -name \*.xml`; do if grep -q http://www.swamid.se/policy/assurance/al2 $$x && ! grep -q http://www.swamid.se/policy/assurance/al1 $$x ; then echo "  $$x" | sed 's/.*/&/' ; fi ; done
+
+testBadStrings:
+	@echo "Check for bad strings in metadata"
+	@for x in `find $(SRCDIRS) -name \*.xml`; do grep -E 'ServiceName xml:lang="[^"]*"/>' $$x | sed 's/^/  /' ; done | grep . && exit 1 || exit 0
+
+testRoleDescriptor:
+
+testRegistrationAuthority:
+	@echo "Check for registrationAuthority="http://www.swamid.se/" in EntityDescriptor/Extensions"
+	@for x in `find $(SRCDIRS) -name \*.xml`; do \
+		if ! cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions" - 2>/dev/null | grep -qE 'registrationAuthority="http://www.swamid.se/"|registrationAuthority="http://www.swamid.se/loop"' ; then \
+			echo "  $$x" | sed 's/.*/&/' ;\
+		fi;\
+	done | grep . && exit 1 || exit 0
+
+checkInvalidChars:
+	@echo "Check for invalid characters"
+	@for x in `find $(SRCDIRS) -name \*.xml`; do \
+		if grep -q "&#13;" $$x ; then \
+			echo "  $$x" | sed 's/.*/&/' ;\
+		fi;\
+	done | grep . && exit 1 || exit 0
+
+checkUKalgorithms:
+	@echo "Check for invalid algorithms in swamid-edugain"
+	@xsltproc --xinclude xslt/check_uk_algorithms.xsl swamid-edugain-1.0.mxml 2>&1 | sed 's/.*/&/' | grep . && exit 1 || exit 0
+
+createMXMLfiles:
+	@echo Recreating MXML files
+	@scripts/create_mxml.sh | sed 's/.*/&/' | grep . && exit 1 || exit 0
+
+signtest: syntaxtest testMDUI testALlevel testEduGAINchecks testRefedsRnS testBadStrings testIdPinSP testRegistrationAuthority checkInvalidChars checkUKalgorithms
+test: $(EDUGAINXML) $(SWAMID20XML) $(TESTINGXML) createMXMLfiles signtest
+
+.time/%.time: swamid-edugain/%.xml
+	@# make tidy
+	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
+	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
+
+	@# make schematest
+	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
+
+	@echo $< done
+	@touch -r $< $@
+
+.time/%.time: swamid-2.0/%.xml
+	@# make tidy
+	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
+	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
+
+	@# make schematest
+	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
+
+	@echo $< done
+	@touch -r $< $@
+
+.time/%.time: swamid-testing/%.xml
+	@# make tidy
+	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
+	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
+
+	@# make schematest
+	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
+
+	@echo $< done
+	@touch -r $< $@
+
+old_check:
+	@# make testMDUI
+	@#echo "Checking for bad lang codes"
+	@# Lang = ISO_639-1
+	@#cat $< | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv|no|nn|nb|is' | sed 's/.*/Bad lang code : &/' | grep . && exit 1 || true
+	@#if [ `grep EntityAttributes $< | wc -l ` -gt 2 ]; then echo "Multiple EntityAttributes" | sed 's/.*/&/' ; exit 1; fi
+	@#if ( grep -q IDPSSODescriptor $< ) ; then \
+		#echo "Do IdP checks" ;  \
+		#echo ">Checking for uniq IdP MDUI DisplayName"; \
+		#for lang in `cat $< | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do \
+			#mdui_displayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[         ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'`;\
+			 #organizationdisplayname=`cat $< | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Organization/OrganizationDisplayName[@xml:lang='$$lang']" - 2>/dev/null | sed 's/^[     ]*//;s/[        ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g'` ;\
+			#for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor | egrep -v $<` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | egrep "^$$mdui_displayname$$" | sed "s;^;Duplicate DisplayName in $$x for lang =  $$lang\n;" | sed 's/.*/&/' ; done | grep . && exit 1 || true;\
+		#done; \
+		#echo ">Checking for invalid IPHint"; \
+		#cat $< | sed -n 's;.*<[a-z0-9:]*IPHint>\(.*\)</[a-z0-9:]*IPHint>;\1;p' | grep -vE '^$$|^[0-9./a-fA-F:]*$$' | sed 's/.*/&/'; \
+		#echo ">Checking for invalid geodata (syntax is geo:xx.yy,zz.vv)";\
+		#cat $< | sed -n 's;.*<[a-z0-9:]*GeolocationHint>\(.*\)</[a-z0-9:]*GeolocationHint>;\1;p' | grep -vE '^$$|^geo:[0-9][0-9][0-9.]*,[0-9][0-9][0-9.]*$$' | sed 's/.*/&/' ; \
+		#echo ">Check for IdP:s with Logos over http";\
+		#cat $< | grep 'Logo .*http://' | sed 's/.*>\(.*\)<.*/\1/' | grep . && exit 1 || exit 0 ; \
+	#fi
+
+
+deeptest: test testMDUIreach
+
+commit: test
+	@git diff --color || true
+	@echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
+	@git status -u
+	@echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/|^swamid-testing/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi
+
+commitold: tidy test
+	@git diff --color || true
+	@echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
+	@git status -u
+	@echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/|^swamid-testing/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi
+	@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
+	@git push
diff --git a/Makefile.validate b/metadata/Makefile.validate
index cc4848bc..cc4848bc 100644
--- a/Makefile.validate
+++ b/metadata/Makefile.validate
diff --git a/certs/e-identitet-swamid.crt b/metadata/certs/e-identitet-swamid.crt
index 688fdbd2..688fdbd2 100644
--- a/certs/e-identitet-swamid.crt
+++ b/metadata/certs/e-identitet-swamid.crt
diff --git a/certs/edugain.crt b/metadata/certs/edugain.crt
index 910a9a30..910a9a30 100644
--- a/certs/edugain.crt
+++ b/metadata/certs/edugain.crt
diff --git a/certs/edugain_2022.crt b/metadata/certs/edugain_2022.crt
index 1ae009d2..1ae009d2 100644
--- a/certs/edugain_2022.crt
+++ b/metadata/certs/edugain_2022.crt
diff --git a/certs/fidus.crt b/metadata/certs/fidus.crt
index 1ef14de7..1ef14de7 100644
--- a/certs/fidus.crt
+++ b/metadata/certs/fidus.crt
diff --git a/certs/kalmar-signer.crt b/metadata/certs/kalmar-signer.crt
index 5ea32a2c..5ea32a2c 100644
--- a/certs/kalmar-signer.crt
+++ b/metadata/certs/kalmar-signer.crt
diff --git a/certs/spaces.internet2.edu.crt b/metadata/certs/spaces.internet2.edu.crt
index f46c3c79..f46c3c79 100644
--- a/certs/spaces.internet2.edu.crt
+++ b/metadata/certs/spaces.internet2.edu.crt
diff --git a/certs/ukfederation.pem b/metadata/certs/ukfederation.pem
index a1f3a57a..a1f3a57a 100644
--- a/certs/ukfederation.pem
+++ b/metadata/certs/ukfederation.pem
diff --git a/schema.xsd b/metadata/schema.xsd
index 2cf3b8fb..2cf3b8fb 100644
--- a/schema.xsd
+++ b/metadata/schema.xsd
diff --git a/schema/MetadataExchange.xsd b/metadata/schema/MetadataExchange.xsd
index 8a54b853..8a54b853 100644
--- a/schema/MetadataExchange.xsd
+++ b/metadata/schema/MetadataExchange.xsd
diff --git a/schema/cs-sstc-schema-assertion-1.1.xsd b/metadata/schema/cs-sstc-schema-assertion-1.1.xsd
index 26f94586..26f94586 100644
--- a/schema/cs-sstc-schema-assertion-1.1.xsd
+++ b/metadata/schema/cs-sstc-schema-assertion-1.1.xsd
diff --git a/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd b/metadata/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd
index 0195d356..0195d356 100644
--- a/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ b/metadata/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd b/metadata/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd
index e088d137..e088d137 100644
--- a/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ b/metadata/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/schema/privacy.xsd b/metadata/schema/privacy.xsd
index cdf1b0bb..cdf1b0bb 100644
--- a/schema/privacy.xsd
+++ b/metadata/schema/privacy.xsd
diff --git a/schema/saml-schema-assertion-2.0.xsd b/metadata/schema/saml-schema-assertion-2.0.xsd
index a00bf11a..a00bf11a 100644
--- a/schema/saml-schema-assertion-2.0.xsd
+++ b/metadata/schema/saml-schema-assertion-2.0.xsd
diff --git a/schema/saml-schema-metadata-2.0.xsd b/metadata/schema/saml-schema-metadata-2.0.xsd
index 97d7cb5c..97d7cb5c 100644
--- a/schema/saml-schema-metadata-2.0.xsd
+++ b/metadata/schema/saml-schema-metadata-2.0.xsd
diff --git a/schema/shibboleth-metadata-1.0.xsd b/metadata/schema/shibboleth-metadata-1.0.xsd
index be1441dd..be1441dd 100644
--- a/schema/shibboleth-metadata-1.0.xsd
+++ b/metadata/schema/shibboleth-metadata-1.0.xsd
diff --git a/schema/shibboleth-trust-1.0.xsd b/metadata/schema/shibboleth-trust-1.0.xsd
index 0e603a5b..0e603a5b 100644
--- a/schema/shibboleth-trust-1.0.xsd
+++ b/metadata/schema/shibboleth-trust-1.0.xsd
diff --git a/schema/shibboleth.xsd b/metadata/schema/shibboleth.xsd
index 392fed45..392fed45 100644
--- a/schema/shibboleth.xsd
+++ b/metadata/schema/shibboleth.xsd
diff --git a/schema/sstc-metadata-attr.xsd b/metadata/schema/sstc-metadata-attr.xsd
index 63c2c0a1..63c2c0a1 100644
--- a/schema/sstc-metadata-attr.xsd
+++ b/metadata/schema/sstc-metadata-attr.xsd
diff --git a/schema/sstc-saml-idp-discovery.xsd b/metadata/schema/sstc-saml-idp-discovery.xsd
index 00da6a38..00da6a38 100644
--- a/schema/sstc-saml-idp-discovery.xsd
+++ b/metadata/schema/sstc-saml-idp-discovery.xsd
diff --git a/schema/sstc-saml-metadata-algsupport.xsd b/metadata/schema/sstc-saml-metadata-algsupport.xsd
index 6c7167df..6c7167df 100644
--- a/schema/sstc-saml-metadata-algsupport.xsd
+++ b/metadata/schema/sstc-saml-metadata-algsupport.xsd
diff --git a/schema/sstc-saml-metadata-ui-v1.0.xsd b/metadata/schema/sstc-saml-metadata-ui-v1.0.xsd
index 5894cb50..5894cb50 100644
--- a/schema/sstc-saml-metadata-ui-v1.0.xsd
+++ b/metadata/schema/sstc-saml-metadata-ui-v1.0.xsd
diff --git a/schema/sstc-saml-schema-assertion-2.0.xsd b/metadata/schema/sstc-saml-schema-assertion-2.0.xsd
index 38233076..38233076 100644
--- a/schema/sstc-saml-schema-assertion-2.0.xsd
+++ b/metadata/schema/sstc-saml-schema-assertion-2.0.xsd
diff --git a/schema/sstc-saml-schema-metadata-2.0.xsd b/metadata/schema/sstc-saml-schema-metadata-2.0.xsd
index 19f4cb91..19f4cb91 100644
--- a/schema/sstc-saml-schema-metadata-2.0.xsd
+++ b/metadata/schema/sstc-saml-schema-metadata-2.0.xsd
diff --git a/schema/ws-addr.xsd b/metadata/schema/ws-addr.xsd
index 47362edb..47362edb 100644
--- a/schema/ws-addr.xsd
+++ b/metadata/schema/ws-addr.xsd
diff --git a/schema/ws-authorization.xsd b/metadata/schema/ws-authorization.xsd
index c52670d8..c52670d8 100644
--- a/schema/ws-authorization.xsd
+++ b/metadata/schema/ws-authorization.xsd
diff --git a/schema/ws-federation.xsd b/metadata/schema/ws-federation.xsd
index 1337dc3c..1337dc3c 100644
--- a/schema/ws-federation.xsd
+++ b/metadata/schema/ws-federation.xsd
diff --git a/schema/ws-securitypolicy-1.2.xsd b/metadata/schema/ws-securitypolicy-1.2.xsd
index fd170c23..fd170c23 100644
--- a/schema/ws-securitypolicy-1.2.xsd
+++ b/metadata/schema/ws-securitypolicy-1.2.xsd
diff --git a/schema/xenc-schema.xsd b/metadata/schema/xenc-schema.xsd
index 64de6f22..64de6f22 100644
--- a/schema/xenc-schema.xsd
+++ b/metadata/schema/xenc-schema.xsd
diff --git a/schema/xml.xsd b/metadata/schema/xml.xsd
index aea7d0db..aea7d0db 100644
--- a/schema/xml.xsd
+++ b/metadata/schema/xml.xsd
diff --git a/schema/xmldsig-core-schema.xsd b/metadata/schema/xmldsig-core-schema.xsd
index 8e556264..8e556264 100644
--- a/schema/xmldsig-core-schema.xsd
+++ b/metadata/schema/xmldsig-core-schema.xsd
diff --git a/scripts/aggregate.sh b/metadata/scripts/aggregate.sh
index 35ac1a7b..35ac1a7b 100755
--- a/scripts/aggregate.sh
+++ b/metadata/scripts/aggregate.sh
diff --git a/scripts/cert-retrieve.sh b/metadata/scripts/cert-retrieve.sh
index 5440b0f8..5440b0f8 100755
--- a/scripts/cert-retrieve.sh
+++ b/metadata/scripts/cert-retrieve.sh
diff --git a/scripts/create_mxml.sh b/metadata/scripts/create_mxml.sh
index bb7855d5..bb7855d5 100755
--- a/scripts/create_mxml.sh
+++ b/metadata/scripts/create_mxml.sh
diff --git a/scripts/expiration_date.pl b/metadata/scripts/expiration_date.pl
index cf297c5f..cf297c5f 100755
--- a/scripts/expiration_date.pl
+++ b/metadata/scripts/expiration_date.pl
diff --git a/scripts/get-metadata.sh b/metadata/scripts/get-metadata.sh
index 16379681..16379681 100755
--- a/scripts/get-metadata.sh
+++ b/metadata/scripts/get-metadata.sh
diff --git a/scripts/now_date.pl b/metadata/scripts/now_date.pl
index 1a5e6890..1a5e6890 100644
--- a/scripts/now_date.pl
+++ b/metadata/scripts/now_date.pl
diff --git a/scripts/pull-and-verify.sh b/metadata/scripts/pull-and-verify.sh
index 8994fab1..8994fab1 100755
--- a/scripts/pull-and-verify.sh
+++ b/metadata/scripts/pull-and-verify.sh
diff --git a/scripts/remove_entity.sh b/metadata/scripts/remove_entity.sh
index 60645a7e..60645a7e 100755
--- a/scripts/remove_entity.sh
+++ b/metadata/scripts/remove_entity.sh
diff --git a/scripts/rename-xml.sh b/metadata/scripts/rename-xml.sh
index 4326579f..4326579f 100755
--- a/scripts/rename-xml.sh
+++ b/metadata/scripts/rename-xml.sh
diff --git a/scripts/unique_id.pl b/metadata/scripts/unique_id.pl
index 18ec9e13..18ec9e13 100644
--- a/scripts/unique_id.pl
+++ b/metadata/scripts/unique_id.pl
diff --git a/scripts/update-and-validate.sh b/metadata/scripts/update-and-validate.sh
index a4a1bddb..a4a1bddb 100755
--- a/scripts/update-and-validate.sh
+++ b/metadata/scripts/update-and-validate.sh
diff --git a/scripts/update-cron.sh b/metadata/scripts/update-cron.sh
index f00daa03..f00daa03 100755
--- a/scripts/update-cron.sh
+++ b/metadata/scripts/update-cron.sh
diff --git a/scripts/update.sh b/metadata/scripts/update.sh
index 5d1a9a2f..5d1a9a2f 100755
--- a/scripts/update.sh
+++ b/metadata/scripts/update.sh
diff --git a/scripts/urls2hostport.py b/metadata/scripts/urls2hostport.py
index c4ff33bf..c4ff33bf 100644
--- a/scripts/urls2hostport.py
+++ b/metadata/scripts/urls2hostport.py
diff --git a/scripts/verify-uiinfo-urls.sh b/metadata/scripts/verify-uiinfo-urls.sh
index b7e1f40a..b7e1f40a 100755
--- a/scripts/verify-uiinfo-urls.sh
+++ b/metadata/scripts/verify-uiinfo-urls.sh
diff --git a/scripts/weekly-routines-metadata.sh b/metadata/scripts/weekly-routines-metadata.sh
index e6178165..e6178165 100755
--- a/scripts/weekly-routines-metadata.sh
+++ b/metadata/scripts/weekly-routines-metadata.sh
diff --git a/site/md.swamid.se/.htaccess b/metadata/site/md.swamid.se/.htaccess
index 4c7de8a4..4c7de8a4 100644
--- a/site/md.swamid.se/.htaccess
+++ b/metadata/site/md.swamid.se/.htaccess
diff --git a/site/md.swamid.se/HEADER.html b/metadata/site/md.swamid.se/HEADER.html
index d784df2a..d784df2a 100644
--- a/site/md.swamid.se/HEADER.html
+++ b/metadata/site/md.swamid.se/HEADER.html
diff --git a/site/md.swamid.se/README.html b/metadata/site/md.swamid.se/README.html
index d7e54b3d..d7e54b3d 100644
--- a/site/md.swamid.se/README.html
+++ b/metadata/site/md.swamid.se/README.html
diff --git a/site/md.swamid.se/bootstrap/css/bootstrap.min.css b/metadata/site/md.swamid.se/bootstrap/css/bootstrap.min.css
index 4cf729e4..4cf729e4 100644
--- a/site/md.swamid.se/bootstrap/css/bootstrap.min.css
+++ b/metadata/site/md.swamid.se/bootstrap/css/bootstrap.min.css
diff --git a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
index b93a4953..b93a4953 100644
--- a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
index 94fb5490..94fb5490 100644
--- a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
index 1413fc60..1413fc60 100644
--- a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
index 9e612858..9e612858 100644
--- a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
index 64539b54..64539b54 100644
--- a/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
+++ b/metadata/site/md.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/site/md.swamid.se/sunet-swamid.png b/metadata/site/md.swamid.se/sunet-swamid.png
index d4cfccb4..d4cfccb4 100644
--- a/site/md.swamid.se/sunet-swamid.png
+++ b/metadata/site/md.swamid.se/sunet-swamid.png
diff --git a/site/md.swamid.se/swamid-logo-3.png b/metadata/site/md.swamid.se/swamid-logo-3.png
index 1f8709a7..1f8709a7 100644
--- a/site/md.swamid.se/swamid-logo-3.png
+++ b/metadata/site/md.swamid.se/swamid-logo-3.png
diff --git a/site/mds.swamid.se/HEADER.html b/metadata/site/mds.swamid.se/HEADER.html
index f81bed0e..f81bed0e 100644
--- a/site/mds.swamid.se/HEADER.html
+++ b/metadata/site/mds.swamid.se/HEADER.html
diff --git a/site/mds.swamid.se/README.html b/metadata/site/mds.swamid.se/README.html
index bce29870..bce29870 100644
--- a/site/mds.swamid.se/README.html
+++ b/metadata/site/mds.swamid.se/README.html
diff --git a/site/mds.swamid.se/SWAMID_FederationDefaults.zip b/metadata/site/mds.swamid.se/SWAMID_FederationDefaults.zip
index 299258cc..299258cc 100644
--- a/site/mds.swamid.se/SWAMID_FederationDefaults.zip
+++ b/metadata/site/mds.swamid.se/SWAMID_FederationDefaults.zip
diff --git a/site/mds.swamid.se/bootstrap/css/bootstrap.min.css b/metadata/site/mds.swamid.se/bootstrap/css/bootstrap.min.css
index 4cf729e4..4cf729e4 100644
--- a/site/mds.swamid.se/bootstrap/css/bootstrap.min.css
+++ b/metadata/site/mds.swamid.se/bootstrap/css/bootstrap.min.css
diff --git a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
index b93a4953..b93a4953 100644
--- a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
index 94fb5490..94fb5490 100644
--- a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
index 1413fc60..1413fc60 100644
--- a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
index 9e612858..9e612858 100644
--- a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
index 64539b54..64539b54 100644
--- a/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
+++ b/metadata/site/mds.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/site/mds.swamid.se/md-signer2.crt b/metadata/site/mds.swamid.se/md-signer2.crt
index f182c7a3..f182c7a3 100644
--- a/site/mds.swamid.se/md-signer2.crt
+++ b/metadata/site/mds.swamid.se/md-signer2.crt
diff --git a/site/mds.swamid.se/sunet-swamid.png b/metadata/site/mds.swamid.se/sunet-swamid.png
index d4cfccb4..d4cfccb4 100644
--- a/site/mds.swamid.se/sunet-swamid.png
+++ b/metadata/site/mds.swamid.se/sunet-swamid.png
diff --git a/site/mds.swamid.se/swamid-logo-3.png b/metadata/site/mds.swamid.se/swamid-logo-3.png
index 1f8709a7..1f8709a7 100644
--- a/site/mds.swamid.se/swamid-logo-3.png
+++ b/metadata/site/mds.swamid.se/swamid-logo-3.png
diff --git a/site/test.swamid.se/HEADER.html b/metadata/site/test.swamid.se/HEADER.html
index 625022dd..625022dd 100644
--- a/site/test.swamid.se/HEADER.html
+++ b/metadata/site/test.swamid.se/HEADER.html
diff --git a/site/test.swamid.se/README.html b/metadata/site/test.swamid.se/README.html
index d7e54b3d..d7e54b3d 100644
--- a/site/test.swamid.se/README.html
+++ b/metadata/site/test.swamid.se/README.html
diff --git a/site/test.swamid.se/bootstrap/css/bootstrap.min.css b/metadata/site/test.swamid.se/bootstrap/css/bootstrap.min.css
index 4cf729e4..4cf729e4 100644
--- a/site/test.swamid.se/bootstrap/css/bootstrap.min.css
+++ b/metadata/site/test.swamid.se/bootstrap/css/bootstrap.min.css
diff --git a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
index b93a4953..b93a4953 100644
--- a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
+++ b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
index 94fb5490..94fb5490 100644
--- a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
index 1413fc60..1413fc60 100644
--- a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
+++ b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
index 9e612858..9e612858 100644
--- a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
+++ b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
index 64539b54..64539b54 100644
--- a/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
+++ b/metadata/site/test.swamid.se/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/site/test.swamid.se/md-signer2.crt b/metadata/site/test.swamid.se/md-signer2.crt
index f182c7a3..f182c7a3 100644
--- a/site/test.swamid.se/md-signer2.crt
+++ b/metadata/site/test.swamid.se/md-signer2.crt
diff --git a/site/test.swamid.se/sunet-swamid.png b/metadata/site/test.swamid.se/sunet-swamid.png
index d4cfccb4..d4cfccb4 100644
--- a/site/test.swamid.se/sunet-swamid.png
+++ b/metadata/site/test.swamid.se/sunet-swamid.png
diff --git a/site/test.swamid.se/swamid-logo-3.png b/metadata/site/test.swamid.se/swamid-logo-3.png
index 1f8709a7..1f8709a7 100644
--- a/site/test.swamid.se/swamid-logo-3.png
+++ b/metadata/site/test.swamid.se/swamid-logo-3.png
diff --git a/swamid-2.0.mxml b/metadata/swamid-2.0.mxml
index d40bb534..d40bb534 100644
--- a/swamid-2.0.mxml
+++ b/metadata/swamid-2.0.mxml
diff --git a/swamid-2.0/7t.lbic.lu.se-.xml b/metadata/swamid-2.0/7t.lbic.lu.se-.xml
index cccd5e7d..cccd5e7d 100644
--- a/swamid-2.0/7t.lbic.lu.se-.xml
+++ b/metadata/swamid-2.0/7t.lbic.lu.se-.xml
diff --git a/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
index 294588ff..294588ff 100644
--- a/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/acc.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
index 827ced8a..827ced8a 100644
--- a/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.nais.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index 49ec51c7..49ec51c7 100644
--- a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/account-idac.ki.se-shibboleth.xml b/metadata/swamid-2.0/account-idac.ki.se-shibboleth.xml
index 3bf5c37b..3bf5c37b 100644
--- a/swamid-2.0/account-idac.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/account-idac.ki.se-shibboleth.xml
diff --git a/swamid-2.0/account-utv.hh.se-Shibboleth.xml b/metadata/swamid-2.0/account-utv.hh.se-Shibboleth.xml
index c676b1b9..c676b1b9 100644
--- a/swamid-2.0/account-utv.hh.se-Shibboleth.xml
+++ b/metadata/swamid-2.0/account-utv.hh.se-Shibboleth.xml
diff --git a/swamid-2.0/account.hh.se-Shibboleth.xml b/metadata/swamid-2.0/account.hh.se-Shibboleth.xml
index 0fdd07b1..0fdd07b1 100644
--- a/swamid-2.0/account.hh.se-Shibboleth.xml
+++ b/metadata/swamid-2.0/account.hh.se-Shibboleth.xml
diff --git a/swamid-2.0/account.lnu.se-Saml2.xml b/metadata/swamid-2.0/account.lnu.se-Saml2.xml
index 5fc5fe20..5fc5fe20 100644
--- a/swamid-2.0/account.lnu.se-Saml2.xml
+++ b/metadata/swamid-2.0/account.lnu.se-Saml2.xml
diff --git a/swamid-2.0/account.mdu.se-shibboleth.xml b/metadata/swamid-2.0/account.mdu.se-shibboleth.xml
index 4c540073..4c540073 100644
--- a/swamid-2.0/account.mdu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/account.mdu.se-shibboleth.xml
diff --git a/swamid-2.0/account.tst.ki.se-shibboleth.xml b/metadata/swamid-2.0/account.tst.ki.se-shibboleth.xml
index 9fa568e7..9fa568e7 100644
--- a/swamid-2.0/account.tst.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/account.tst.ki.se-shibboleth.xml
diff --git a/swamid-2.0/activate-test.du.se-shibboleth.xml b/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
index 2dfe5e9c..2dfe5e9c 100644
--- a/swamid-2.0/activate-test.du.se-shibboleth.xml
+++ b/metadata/swamid-2.0/activate-test.du.se-shibboleth.xml
diff --git a/swamid-2.0/activate.du.se-shibboleth.xml b/metadata/swamid-2.0/activate.du.se-shibboleth.xml
index e7cf40e8..e7cf40e8 100644
--- a/swamid-2.0/activate.du.se-shibboleth.xml
+++ b/metadata/swamid-2.0/activate.du.se-shibboleth.xml
diff --git a/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml b/metadata/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
index 773bc9cd..773bc9cd 100644
--- a/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/adfs.artologik.net-adfs-services-trust.xml
diff --git a/swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml b/metadata/swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml
index f1d7c336..f1d7c336 100644
--- a/swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/admin.akademiskahogtider.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml
index 5dbedd0c..5dbedd0c 100644
--- a/swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/admin.selma7.its.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml b/metadata/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
index 9b9fd9b1..9b9fd9b1 100644
--- a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
diff --git a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml b/metadata/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
index c60c55ae..c60c55ae 100644
--- a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
diff --git a/swamid-2.0/agate.cohorts.medsci.test.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/agate.cohorts.medsci.test.uu.se-Shibboleth.sso.xml
index bfa1b3b2..bfa1b3b2 100644
--- a/swamid-2.0/agate.cohorts.medsci.test.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/agate.cohorts.medsci.test.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml
index 792046d8..792046d8 100644
--- a/swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/akka-adm.uu.se-shibboleth.xml b/metadata/swamid-2.0/akka-adm.uu.se-shibboleth.xml
index a347ea5b..a347ea5b 100644
--- a/swamid-2.0/akka-adm.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/akka-adm.uu.se-shibboleth.xml
diff --git a/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml
index e63df624..e63df624 100644
--- a/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/akka-mini-mdh-test.its.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml
index 03b53833..03b53833 100644
--- a/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/akka-mini-mdh.its.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
index d7decd7d..d7decd7d 100644
--- a/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/aktivera-test.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
index a508b1fb..a508b1fb 100644
--- a/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/aktivera.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/almagest.sai.kau.se.xml b/metadata/swamid-2.0/almagest.sai.kau.se.xml
index 708cdf5f..708cdf5f 100644
--- a/swamid-2.0/almagest.sai.kau.se.xml
+++ b/metadata/swamid-2.0/almagest.sai.kau.se.xml
diff --git a/swamid-2.0/ams.ki.se-shibboleth.xml b/metadata/swamid-2.0/ams.ki.se-shibboleth.xml
index 52d7af8e..52d7af8e 100644
--- a/swamid-2.0/ams.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ams.ki.se-shibboleth.xml
diff --git a/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
index 9d7d223e..9d7d223e 100644
--- a/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/anonymous.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/antagningsp.slu.se-shibboleth.xml b/metadata/swamid-2.0/antagningsp.slu.se-shibboleth.xml
index d5b44d32..d5b44d32 100644
--- a/swamid-2.0/antagningsp.slu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/antagningsp.slu.se-shibboleth.xml
diff --git a/swamid-2.0/app.sh.se.xml b/metadata/swamid-2.0/app.sh.se.xml
index 6e8ebf0e..6e8ebf0e 100644
--- a/swamid-2.0/app.sh.se.xml
+++ b/metadata/swamid-2.0/app.sh.se.xml
diff --git a/swamid-2.0/apps.convertus.se-shibboleth.xml b/metadata/swamid-2.0/apps.convertus.se-shibboleth.xml
index e3f15266..e3f15266 100644
--- a/swamid-2.0/apps.convertus.se-shibboleth.xml
+++ b/metadata/swamid-2.0/apps.convertus.se-shibboleth.xml
diff --git a/swamid-2.0/appstest.convertus.se-shibboleth.xml b/metadata/swamid-2.0/appstest.convertus.se-shibboleth.xml
index e9c05224..e9c05224 100644
--- a/swamid-2.0/appstest.convertus.se-shibboleth.xml
+++ b/metadata/swamid-2.0/appstest.convertus.se-shibboleth.xml
diff --git a/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
index b3160cea..b3160cea 100644
--- a/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-2.0/assemblage.dc.kau.se.xml b/metadata/swamid-2.0/assemblage.dc.kau.se.xml
index cd00cc1f..cd00cc1f 100644
--- a/swamid-2.0/assemblage.dc.kau.se.xml
+++ b/metadata/swamid-2.0/assemblage.dc.kau.se.xml
diff --git a/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
index db70523c..db70523c 100644
--- a/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/backweb.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/backweb.antagning.se-hubble-sp.xml
index 041b8ab3..041b8ab3 100644
--- a/swamid-2.0/backweb.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/backweb.antagning.se-hubble-sp.xml
diff --git a/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
index a8b3f385..a8b3f385 100644
--- a/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml
diff --git a/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml
index 5bb8faba..5bb8faba 100644
--- a/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml
diff --git a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
index 8099dee6..8099dee6 100644
--- a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
diff --git a/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-administration.xml b/metadata/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-administration.xml
index d42c479d..d42c479d 100644
--- a/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-administration.xml
+++ b/metadata/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-administration.xml
diff --git a/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-inrapportering.xml b/metadata/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-inrapportering.xml
index 998a2fc4..998a2fc4 100644
--- a/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-inrapportering.xml
+++ b/metadata/swamid-2.0/beda-samtest.nya-srv.its.umu.se-beda-inrapportering.xml
diff --git a/swamid-2.0/beda-tools.nya-srv.its.umu.se-8443-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/beda-tools.nya-srv.its.umu.se-8443-proxy-sp-metadata.xml.xml
index 95d07afa..95d07afa 100644
--- a/swamid-2.0/beda-tools.nya-srv.its.umu.se-8443-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/beda-tools.nya-srv.its.umu.se-8443-proxy-sp-metadata.xml.xml
diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/metadata/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
index 618dc9b6..618dc9b6 100644
--- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml b/metadata/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
index b14ee4a9..b14ee4a9 100644
--- a/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/beta-NyAsidorna.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/beta-kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/beta-kib.ki.se-shibboleth.xml
index 94b3e72c..94b3e72c 100644
--- a/swamid-2.0/beta-kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/beta-kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/bifur.sai.kau.se.xml b/metadata/swamid-2.0/bifur.sai.kau.se.xml
index a9c2fbf5..a9c2fbf5 100644
--- a/swamid-2.0/bifur.sai.kau.se.xml
+++ b/metadata/swamid-2.0/bifur.sai.kau.se.xml
diff --git a/swamid-2.0/blender.c3se.chalmers.se-a.xml b/metadata/swamid-2.0/blender.c3se.chalmers.se-a.xml
index d304f239..d304f239 100644
--- a/swamid-2.0/blender.c3se.chalmers.se-a.xml
+++ b/metadata/swamid-2.0/blender.c3se.chalmers.se-a.xml
diff --git a/swamid-2.0/bofur.sae.kau.se.xml b/metadata/swamid-2.0/bofur.sae.kau.se.xml
index 4bb4972d..4bb4972d 100644
--- a/swamid-2.0/bofur.sae.kau.se.xml
+++ b/metadata/swamid-2.0/bofur.sae.kau.se.xml
diff --git a/swamid-2.0/bombur.sau.kau.se.xml b/metadata/swamid-2.0/bombur.sau.kau.se.xml
index 533311de..533311de 100644
--- a/swamid-2.0/bombur.sau.kau.se.xml
+++ b/metadata/swamid-2.0/bombur.sau.kau.se.xml
diff --git a/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
index 379c27a7..379c27a7 100644
--- a/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/bookings-stage.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/bookings.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
index 5881918c..5881918c 100644
--- a/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/bookings.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/bookstack.sai.kau.se-saml2-metadata.xml b/metadata/swamid-2.0/bookstack.sai.kau.se-saml2-metadata.xml
index 1e49ee51..1e49ee51 100644
--- a/swamid-2.0/bookstack.sai.kau.se-saml2-metadata.xml
+++ b/metadata/swamid-2.0/bookstack.sai.kau.se-saml2-metadata.xml
diff --git a/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml
index 93f24482..93f24482 100644
--- a/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/box-saas-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-2.0/brandkeeper.se-wsfed.xml b/metadata/swamid-2.0/brandkeeper.se-wsfed.xml
index 31b25383..31b25383 100644
--- a/swamid-2.0/brandkeeper.se-wsfed.xml
+++ b/metadata/swamid-2.0/brandkeeper.se-wsfed.xml
diff --git a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 647dd63b..647dd63b 100644
--- a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/campuskort-test.irt.uu.se-.xml b/metadata/swamid-2.0/campuskort-test.irt.uu.se-.xml
index bbb72f7f..bbb72f7f 100644
--- a/swamid-2.0/campuskort-test.irt.uu.se-.xml
+++ b/metadata/swamid-2.0/campuskort-test.irt.uu.se-.xml
diff --git a/swamid-2.0/campuskort.uu.se-.xml b/metadata/swamid-2.0/campuskort.uu.se-.xml
index ec4690c0..ec4690c0 100644
--- a/swamid-2.0/campuskort.uu.se-.xml
+++ b/metadata/swamid-2.0/campuskort.uu.se-.xml
diff --git a/swamid-2.0/canvas.education.lu.se-saml2.xml b/metadata/swamid-2.0/canvas.education.lu.se-saml2.xml
index e6edca60..e6edca60 100644
--- a/swamid-2.0/canvas.education.lu.se-saml2.xml
+++ b/metadata/swamid-2.0/canvas.education.lu.se-saml2.xml
diff --git a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/metadata/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 41462964..41462964 100644
--- a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/metadata/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
diff --git a/swamid-2.0/client200-180.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
index 9fc58db3..9fc58db3 100644
--- a/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
index a530e4f8..a530e4f8 100644
--- a/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
index e647a425..e647a425 100644
--- a/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/cocov1-2.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
index ae4bb710..ae4bb710 100644
--- a/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/cocov1-3.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
index 541f98f0..541f98f0 100644
--- a/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/cocov2-1.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
index 0cbfa524..0cbfa524 100644
--- a/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/cocov2-2.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
index bb1136dd..bb1136dd 100644
--- a/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/cocov2-3.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/cohorts.medsci.test.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/cohorts.medsci.test.uu.se-Shibboleth.sso.xml
index 36bacd88..36bacd88 100644
--- a/swamid-2.0/cohorts.medsci.test.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/cohorts.medsci.test.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml
index b3c7c0ec..b3c7c0ec 100644
--- a/swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
index 4887be3b..4887be3b 100644
--- a/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml
index 6e49b70d..6e49b70d 100644
--- a/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
index ebbdeab8..ebbdeab8 100644
--- a/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml
index 6a7f389e..6a7f389e 100644
--- a/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/confluence.it.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/confluence.its.umu.se-shibboleth.xml
index 88a60da1..88a60da1 100644
--- a/swamid-2.0/confluence.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/confluence.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/connect.dev.eduid.se-eduidsp.xml b/metadata/swamid-2.0/connect.dev.eduid.se-eduidsp.xml
index ef3773bf..ef3773bf 100644
--- a/swamid-2.0/connect.dev.eduid.se-eduidsp.xml
+++ b/metadata/swamid-2.0/connect.dev.eduid.se-eduidsp.xml
diff --git a/swamid-2.0/connect.eduid.se-eduidsp.xml b/metadata/swamid-2.0/connect.eduid.se-eduidsp.xml
index e9129491..e9129491 100644
--- a/swamid-2.0/connect.eduid.se-eduidsp.xml
+++ b/metadata/swamid-2.0/connect.eduid.se-eduidsp.xml
diff --git a/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml b/metadata/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
index 3b2bedc8..3b2bedc8 100644
--- a/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
+++ b/metadata/swamid-2.0/coursegit.cs.lth.se-gitlab-saml.xml
diff --git a/swamid-2.0/crowd-test.sunet.se-shibboleth.xml b/metadata/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
index 65f32ec7..65f32ec7 100644
--- a/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/crowd-test.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/cuttlefish.pdc.kth.se.xml b/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
index 093e61a0..093e61a0 100644
--- a/swamid-2.0/cuttlefish.pdc.kth.se.xml
+++ b/metadata/swamid-2.0/cuttlefish.pdc.kth.se.xml
diff --git a/swamid-2.0/data.houseoffinance.se-shibboleth.xml b/metadata/swamid-2.0/data.houseoffinance.se-shibboleth.xml
index 409497e4..409497e4 100644
--- a/swamid-2.0/data.houseoffinance.se-shibboleth.xml
+++ b/metadata/swamid-2.0/data.houseoffinance.se-shibboleth.xml
diff --git a/swamid-2.0/datalab.humlab.umu.se.xml b/metadata/swamid-2.0/datalab.humlab.umu.se.xml
index f19a737d..f19a737d 100644
--- a/swamid-2.0/datalab.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/datalab.humlab.umu.se.xml
diff --git a/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml b/metadata/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
index 4d28dc4d..4d28dc4d 100644
--- a/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml b/metadata/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
index 0dbba7f2..0dbba7f2 100644
--- a/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
index 355ae844..355ae844 100644
--- a/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/dev-idp-lab.utv.ladok.se-proxy-sp-metadata.xml.xml
diff --git a/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
index 44e57773..44e57773 100644
--- a/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/dev-idp.utv.ladok.se-proxy-sp-metadata.xml.xml
diff --git a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
index a42d7427..a42d7427 100644
--- a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/dev.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
index 5a3ad763..5a3ad763 100644
--- a/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/devpassport.lu.se-activateaccount-shibboleth.xml b/metadata/swamid-2.0/devpassport.lu.se-activateaccount-shibboleth.xml
index 36685e6b..36685e6b 100644
--- a/swamid-2.0/devpassport.lu.se-activateaccount-shibboleth.xml
+++ b/metadata/swamid-2.0/devpassport.lu.se-activateaccount-shibboleth.xml
diff --git a/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index a4c5aac0..a4c5aac0 100644
--- a/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/digkonto-test.ita.chalmers.se.xml b/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
index d01195da..d01195da 100644
--- a/swamid-2.0/digkonto-test.ita.chalmers.se.xml
+++ b/metadata/swamid-2.0/digkonto-test.ita.chalmers.se.xml
diff --git a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index 84955b33..84955b33 100644
--- a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/metadata/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
diff --git a/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml b/metadata/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
index 1696aeff..1696aeff 100644
--- a/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
+++ b/metadata/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
diff --git a/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml
index 3f54d874..3f54d874 100644
--- a/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp-ci.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml
index 8b9d017c..8b9d017c 100644
--- a/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp-dev.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml
index c614fa5e..c614fa5e 100644
--- a/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp-test.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/disp.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/disp.su.se-Shibboleth.sso.xml
index f637fb70..f637fb70 100644
--- a/swamid-2.0/disp.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/disp.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/disposer.c3se.chalmers.se.xml b/metadata/swamid-2.0/disposer.c3se.chalmers.se.xml
index 78c82b8f..78c82b8f 100644
--- a/swamid-2.0/disposer.c3se.chalmers.se.xml
+++ b/metadata/swamid-2.0/disposer.c3se.chalmers.se.xml
diff --git a/swamid-2.0/du-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/du-graylog.cnaas.sunet.se.xml
index f9706951..f9706951 100644
--- a/swamid-2.0/du-graylog.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/du-graylog.cnaas.sunet.se.xml
diff --git a/swamid-2.0/du-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/du-nav.cnaas.sunet.se.xml
index a4f43d68..a4f43d68 100644
--- a/swamid-2.0/du-nav.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/du-nav.cnaas.sunet.se.xml
diff --git a/swamid-2.0/du-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/du-ni.cnaas.sunet.se.xml
index 66a3bf21..66a3bf21 100644
--- a/swamid-2.0/du-ni.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/du-ni.cnaas.sunet.se.xml
diff --git a/swamid-2.0/du.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/du.hr.evry.se-shibboleth.xml
index 1079cf09..1079cf09 100644
--- a/swamid-2.0/du.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/du.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 19e950ba..19e950ba 100644
--- a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/e5.onthehub.com.xml b/metadata/swamid-2.0/e5.onthehub.com.xml
index 8f9877ca..8f9877ca 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/metadata/swamid-2.0/e5.onthehub.com.xml
diff --git a/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d0b21ee8..d0b21ee8 100644
--- a/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index a4da7544..a4da7544 100644
--- a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/eduroamkonto.kau.se.xml b/metadata/swamid-2.0/eduroamkonto.kau.se.xml
index 7530cb64..7530cb64 100644
--- a/swamid-2.0/eduroamkonto.kau.se.xml
+++ b/metadata/swamid-2.0/eduroamkonto.kau.se.xml
diff --git a/swamid-2.0/edusign-test.test.hb.se-shibboleth.xml b/metadata/swamid-2.0/edusign-test.test.hb.se-shibboleth.xml
index cc5ea692..cc5ea692 100644
--- a/swamid-2.0/edusign-test.test.hb.se-shibboleth.xml
+++ b/metadata/swamid-2.0/edusign-test.test.hb.se-shibboleth.xml
diff --git a/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/metadata/swamid-2.0/epc.ub.uu.se-shibboleth.xml
index c08442be..c08442be 100644
--- a/swamid-2.0/epc.ub.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/epc.ub.uu.se-shibboleth.xml
diff --git a/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
index 124f2754..124f2754 100644
--- a/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/esi.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/etenta.math.su.se-shibboleth.xml b/metadata/swamid-2.0/etenta.math.su.se-shibboleth.xml
index 351a000f..351a000f 100644
--- a/swamid-2.0/etenta.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/etenta.math.su.se-shibboleth.xml
diff --git a/swamid-2.0/examensansokan.portal.chalmers.se.xml b/metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml
index 32784436..32784436 100644
--- a/swamid-2.0/examensansokan.portal.chalmers.se.xml
+++ b/metadata/swamid-2.0/examensansokan.portal.chalmers.se.xml
diff --git a/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml b/metadata/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml
index 8f693638..8f693638 100644
--- a/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml
diff --git a/swamid-2.0/expert.antagning.se-ecs-sp.xml b/metadata/swamid-2.0/expert.antagning.se-ecs-sp.xml
index 3fbdaec3..3fbdaec3 100644
--- a/swamid-2.0/expert.antagning.se-ecs-sp.xml
+++ b/metadata/swamid-2.0/expert.antagning.se-ecs-sp.xml
diff --git a/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml b/metadata/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
index 971fb630..971fb630 100644
--- a/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
+++ b/metadata/swamid-2.0/expert.demo.antagning.se-ecs-sp.xml
diff --git a/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml b/metadata/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
index d8fefe92..d8fefe92 100644
--- a/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
+++ b/metadata/swamid-2.0/expert.hubbletest.antagning.se-ecs-sp.xml
diff --git a/swamid-2.0/expert.stage.antagning.se-expert-sp.xml b/metadata/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
index 5c270917..5c270917 100644
--- a/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
+++ b/metadata/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
diff --git a/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml b/metadata/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
index 8285d3f5..8285d3f5 100644
--- a/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
+++ b/metadata/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
diff --git a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml b/metadata/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
index 655e0bba..655e0bba 100644
--- a/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
+++ b/metadata/swamid-2.0/expert.test.antagning.se-ecs-sp.xml
diff --git a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml b/metadata/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
index 54310184..54310184 100644
--- a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
diff --git a/swamid-2.0/fs.uka.se-adfs-services-trust.xml b/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml
index 12e5d8fc..12e5d8fc 100644
--- a/swamid-2.0/fs.uka.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/fs.uka.se-adfs-services-trust.xml
diff --git a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml b/metadata/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
index 3a7685fc..3a7685fc 100644
--- a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
+++ b/metadata/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
diff --git a/swamid-2.0/get.eduroam.se.xml b/metadata/swamid-2.0/get.eduroam.se.xml
index 213ff8d9..213ff8d9 100644
--- a/swamid-2.0/get.eduroam.se.xml
+++ b/metadata/swamid-2.0/get.eduroam.se.xml
diff --git a/swamid-2.0/gih-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/gih-nav.cnaas.sunet.se.xml
index b7de3437..b7de3437 100644
--- a/swamid-2.0/gih-nav.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/gih-nav.cnaas.sunet.se.xml
diff --git a/swamid-2.0/graylog.sunet.se-shibboleth.xml b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
index d22a70a0..d22a70a0 100644
--- a/swamid-2.0/graylog.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/graylog.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
index 03e609b7..03e609b7 100644
--- a/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/halon-eu.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/hb.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/hb.hr.evry.se-shibboleth.xml
index d4d0679c..d4d0679c 100644
--- a/swamid-2.0/hb.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/hb.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/hhs-se.zoom.us.xml b/metadata/swamid-2.0/hhs-se.zoom.us.xml
index c3ae2b20..c3ae2b20 100644
--- a/swamid-2.0/hhs-se.zoom.us.xml
+++ b/metadata/swamid-2.0/hhs-se.zoom.us.xml
diff --git a/swamid-2.0/his-se.zoom.us.xml b/metadata/swamid-2.0/his-se.zoom.us.xml
index f5d836ee..f5d836ee 100644
--- a/swamid-2.0/his-se.zoom.us.xml
+++ b/metadata/swamid-2.0/his-se.zoom.us.xml
diff --git a/swamid-2.0/his.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/his.hr.evry.se-shibboleth.xml
index 0ea56d7d..0ea56d7d 100644
--- a/swamid-2.0/his.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/his.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/hkrplay.hkr.se.xml b/metadata/swamid-2.0/hkrplay.hkr.se.xml
index 322b4129..322b4129 100644
--- a/swamid-2.0/hkrplay.hkr.se.xml
+++ b/metadata/swamid-2.0/hkrplay.hkr.se.xml
diff --git a/swamid-2.0/hr.su.se-shibboleth.xml b/metadata/swamid-2.0/hr.su.se-shibboleth.xml
index fc18654e..fc18654e 100644
--- a/swamid-2.0/hr.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/hr.su.se-shibboleth.xml
diff --git a/swamid-2.0/hrm.flexhosting.se-HRM-.xml b/metadata/swamid-2.0/hrm.flexhosting.se-HRM-.xml
index 004389ca..004389ca 100644
--- a/swamid-2.0/hrm.flexhosting.se-HRM-.xml
+++ b/metadata/swamid-2.0/hrm.flexhosting.se-HRM-.xml
diff --git a/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml
index 2310e033..2310e033 100644
--- a/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/humhub-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-2.0/hvplay.hv.se.xml b/metadata/swamid-2.0/hvplay.hv.se.xml
index 4253ef89..4253ef89 100644
--- a/swamid-2.0/hvplay.hv.se.xml
+++ b/metadata/swamid-2.0/hvplay.hv.se.xml
diff --git a/swamid-2.0/id-test.du.se-saml2.xml b/metadata/swamid-2.0/id-test.du.se-saml2.xml
index 07e41b6f..07e41b6f 100644
--- a/swamid-2.0/id-test.du.se-saml2.xml
+++ b/metadata/swamid-2.0/id-test.du.se-saml2.xml
diff --git a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml b/metadata/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
index 8381cd4b..8381cd4b 100644
--- a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
diff --git a/swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml b/metadata/swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml
index 749f606f..749f606f 100644
--- a/swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/idp-proxy-social-test.sunet.se-sp.xml
diff --git a/swamid-2.0/idp-proxy-social.sunet.se-sp.xml b/metadata/swamid-2.0/idp-proxy-social.sunet.se-sp.xml
index 719d8e89..719d8e89 100644
--- a/swamid-2.0/idp-proxy-social.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/idp-proxy-social.sunet.se-sp.xml
diff --git a/swamid-2.0/idp.antagning.se-aws-idp.xml b/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
index 7ce135fc..7ce135fc 100644
--- a/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/metadata/swamid-2.0/idp.antagning.se-aws-idp.xml
diff --git a/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml b/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
index f815bc9d..f815bc9d 100644
--- a/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
+++ b/metadata/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml b/metadata/swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml
index c2bb048e..c2bb048e 100644
--- a/swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml
+++ b/metadata/swamid-2.0/idpproxy.dev.eduid.se-eduidsp.xml
diff --git a/swamid-2.0/idpproxy.dev.eduid.se-sp.xml b/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
index c5202c21..c5202c21 100644
--- a/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
+++ b/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
diff --git a/swamid-2.0/ids-test.mau.se-.xml b/metadata/swamid-2.0/ids-test.mau.se-.xml
index feb800fb..feb800fb 100644
--- a/swamid-2.0/ids-test.mau.se-.xml
+++ b/metadata/swamid-2.0/ids-test.mau.se-.xml
diff --git a/swamid-2.0/ids.mau.se-.xml b/metadata/swamid-2.0/ids.mau.se-.xml
index 130f5ecf..130f5ecf 100644
--- a/swamid-2.0/ids.mau.se-.xml
+++ b/metadata/swamid-2.0/ids.mau.se-.xml
diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/metadata/swamid-2.0/indico.test.uu.se-shibboleth.xml
index 3b25454d..3b25454d 100644
--- a/swamid-2.0/indico.test.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/indico.test.uu.se-shibboleth.xml
diff --git a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml b/metadata/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
index 7f028a25..7f028a25 100644
--- a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
+++ b/metadata/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
diff --git a/swamid-2.0/int-admin.selma7.its.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/int-admin.selma7.its.uu.se-Shibboleth.sso.xml
index 17c72a73..17c72a73 100644
--- a/swamid-2.0/int-admin.selma7.its.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/int-admin.selma7.its.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml b/metadata/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
index 98447c27..98447c27 100644
--- a/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
+++ b/metadata/swamid-2.0/integratorsportal.ladok.se-shibboleth.xml
diff --git a/swamid-2.0/intranet.nai.uu.se.xml b/metadata/swamid-2.0/intranet.nai.uu.se.xml
index de7c7bb1..de7c7bb1 100644
--- a/swamid-2.0/intranet.nai.uu.se.xml
+++ b/metadata/swamid-2.0/intranet.nai.uu.se.xml
diff --git a/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml b/metadata/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml
index 050d856b..050d856b 100644
--- a/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/irf.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/irf.hr.evry.se-shibboleth.xml
index 9abc578c..9abc578c 100644
--- a/swamid-2.0/irf.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/irf.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
index 045cbce5..045cbce5 100644
--- a/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/jenkins-infra.utv.ladok.se-securityRealm-finishLogin.xml
diff --git a/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
index bf36de1e..bf36de1e 100644
--- a/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/jenkins.led.ladok.se-securityRealm-finishLogin.xml
diff --git a/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
index 2f572318..2f572318 100644
--- a/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira-dev.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/jira-next.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
index 4736993e..4736993e 100644
--- a/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira-next.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 93c14f75..93c14f75 100644
--- a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/jira.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/jira.its.umu.se-shibboleth.xml
index 64343de0..64343de0 100644
--- a/swamid-2.0/jira.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/jira.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/jss.kau.se-8443-saml-metadata.xml b/metadata/swamid-2.0/jss.kau.se-8443-saml-metadata.xml
index f564eaaa..f564eaaa 100644
--- a/swamid-2.0/jss.kau.se-8443-saml-metadata.xml
+++ b/metadata/swamid-2.0/jss.kau.se-8443-saml-metadata.xml
diff --git a/swamid-2.0/kau-se.zoom.us.xml b/metadata/swamid-2.0/kau-se.zoom.us.xml
index 73e96700..73e96700 100644
--- a/swamid-2.0/kau-se.zoom.us.xml
+++ b/metadata/swamid-2.0/kau-se.zoom.us.xml
diff --git a/swamid-2.0/kau.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/kau.hr.evry.se-shibboleth.xml
index 4dd2a2da..4dd2a2da 100644
--- a/swamid-2.0/kau.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kau.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/kau.instructure.com-saml2.xml b/metadata/swamid-2.0/kau.instructure.com-saml2.xml
index 4e3cf01e..4e3cf01e 100644
--- a/swamid-2.0/kau.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/kau.instructure.com-saml2.xml
diff --git a/swamid-2.0/kaucat.sai.kau.se-shibboleth.xml b/metadata/swamid-2.0/kaucat.sai.kau.se-shibboleth.xml
index 0ece9024..0ece9024 100644
--- a/swamid-2.0/kaucat.sai.kau.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kaucat.sai.kau.se-shibboleth.xml
diff --git a/swamid-2.0/kauplay.kau.se.xml b/metadata/swamid-2.0/kauplay.kau.se.xml
index ecfb1293..ecfb1293 100644
--- a/swamid-2.0/kauplay.kau.se.xml
+++ b/metadata/swamid-2.0/kauplay.kau.se.xml
diff --git a/swamid-2.0/kb-se.zoom.us.xml b/metadata/swamid-2.0/kb-se.zoom.us.xml
index 4cda98be..4cda98be 100644
--- a/swamid-2.0/kb-se.zoom.us.xml
+++ b/metadata/swamid-2.0/kb-se.zoom.us.xml
diff --git a/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml b/metadata/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml
index 800229b8..800229b8 100644
--- a/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
index 29e7a060..29e7a060 100644
--- a/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/ki.alma.exlibrisgroup.com-mng-login.xml
diff --git a/swamid-2.0/ki.elements.symplectic.org.xml b/metadata/swamid-2.0/ki.elements.symplectic.org.xml
index 09920fb5..09920fb5 100644
--- a/swamid-2.0/ki.elements.symplectic.org.xml
+++ b/metadata/swamid-2.0/ki.elements.symplectic.org.xml
diff --git a/swamid-2.0/ki.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/ki.hr.evry.se-shibboleth.xml
index b913a901..b913a901 100644
--- a/swamid-2.0/ki.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ki.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
index c0e98f0e..c0e98f0e 100644
--- a/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/ki.primo.exlibrisgroup.com-mng-login.xml
diff --git a/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml
index 577a73b4..577a73b4 100644
--- a/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kib-stage2.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/klara.port.se-shibboleth.xml b/metadata/swamid-2.0/klara.port.se-shibboleth.xml
index dc01a2f4..dc01a2f4 100644
--- a/swamid-2.0/klara.port.se-shibboleth.xml
+++ b/metadata/swamid-2.0/klara.port.se-shibboleth.xml
diff --git a/swamid-2.0/kmh.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
index 304309a6..304309a6 100644
--- a/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/konto.bth.se-sp.xml b/metadata/swamid-2.0/konto.bth.se-sp.xml
index c87fe834..c87fe834 100644
--- a/swamid-2.0/konto.bth.se-sp.xml
+++ b/metadata/swamid-2.0/konto.bth.se-sp.xml
diff --git a/swamid-2.0/konto.gih.se-Saml2.xml b/metadata/swamid-2.0/konto.gih.se-Saml2.xml
index 92141a1e..92141a1e 100644
--- a/swamid-2.0/konto.gih.se-Saml2.xml
+++ b/metadata/swamid-2.0/konto.gih.se-Saml2.xml
diff --git a/swamid-2.0/konto.hb.se-Shibboleth.xml b/metadata/swamid-2.0/konto.hb.se-Shibboleth.xml
index e387499d..e387499d 100644
--- a/swamid-2.0/konto.hb.se-Shibboleth.xml
+++ b/metadata/swamid-2.0/konto.hb.se-Shibboleth.xml
diff --git a/swamid-2.0/konto.hig.se-443-idm.xml b/metadata/swamid-2.0/konto.hig.se-443-idm.xml
index c18c84d7..c18c84d7 100644
--- a/swamid-2.0/konto.hig.se-443-idm.xml
+++ b/metadata/swamid-2.0/konto.hig.se-443-idm.xml
diff --git a/swamid-2.0/konto.his.se.xml b/metadata/swamid-2.0/konto.his.se.xml
index b017ceb1..b017ceb1 100644
--- a/swamid-2.0/konto.his.se.xml
+++ b/metadata/swamid-2.0/konto.his.se.xml
diff --git a/swamid-2.0/konto.kau.se.xml b/metadata/swamid-2.0/konto.kau.se.xml
index 30932ac0..30932ac0 100644
--- a/swamid-2.0/konto.kau.se.xml
+++ b/metadata/swamid-2.0/konto.kau.se.xml
diff --git a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml b/metadata/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
index b3579fa9..b3579fa9 100644
--- a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
diff --git a/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
index e0a966d0..e0a966d0 100644
--- a/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kontrollpanelen.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/kth-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
index 955e8c25..955e8c25 100644
--- a/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
diff --git a/swamid-2.0/kth-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-nav.cnaas.sunet.se.xml
index 095f22ba..095f22ba 100644
--- a/swamid-2.0/kth-nav.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/kth-nav.cnaas.sunet.se.xml
diff --git a/swamid-2.0/kth-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/kth-ni.cnaas.sunet.se.xml
index 47f007e9..47f007e9 100644
--- a/swamid-2.0/kth-ni.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/kth-ni.cnaas.sunet.se.xml
diff --git a/swamid-2.0/kurser.math.su.se-shibboleth.xml b/metadata/swamid-2.0/kurser.math.su.se-shibboleth.xml
index a8b4af18..a8b4af18 100644
--- a/swamid-2.0/kurser.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/kurser.math.su.se-shibboleth.xml
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index b3cc3b4f..b3cc3b4f 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index 479beac0..479beac0 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
index 6e6f9c0d..6e6f9c0d 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml
diff --git a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
index 6357f43c..6357f43c 100644
--- a/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
+++ b/metadata/swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml
diff --git a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
index bb3f97ec..bb3f97ec 100644
--- a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityRealm-finishLogin.xml
diff --git a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml b/metadata/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
index f6a90fd2..f6a90fd2 100644
--- a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
+++ b/metadata/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityRealm-finishLogin.xml
diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index e8b82ea5..e8b82ea5 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml b/metadata/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
index 8ff4247b..8ff4247b 100644
--- a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
diff --git a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml b/metadata/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
index 36bdfe4d..36bdfe4d 100644
--- a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
+++ b/metadata/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
diff --git a/swamid-2.0/lis.ladok.se-shibboleth.xml b/metadata/swamid-2.0/lis.ladok.se-shibboleth.xml
index a8b316c3..a8b316c3 100644
--- a/swamid-2.0/lis.ladok.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lis.ladok.se-shibboleth.xml
diff --git a/swamid-2.0/lis.test.ladok.se-shibboleth.xml b/metadata/swamid-2.0/lis.test.ladok.se-shibboleth.xml
index b607c58b..b607c58b 100644
--- a/swamid-2.0/lis.test.ladok.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lis.test.ladok.se-shibboleth.xml
diff --git a/swamid-2.0/lists-test.its.uu.se-shibboleth.xml b/metadata/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
index 4e7d28bc..4e7d28bc 100644
--- a/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lists-test.its.uu.se-shibboleth.xml
diff --git a/swamid-2.0/lists.uu.se-shibboleth.xml b/metadata/swamid-2.0/lists.uu.se-shibboleth.xml
index d66ee74e..d66ee74e 100644
--- a/swamid-2.0/lists.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lists.uu.se-shibboleth.xml
diff --git a/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml b/metadata/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
index a87f62cb..a87f62cb 100644
--- a/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lmdl756.cs.lth.se-shibboleth.xml
diff --git a/swamid-2.0/lnu.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/lnu.hr.evry.se-shibboleth.xml
index cd6fda7f..cd6fda7f 100644
--- a/swamid-2.0/lnu.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/lnu.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml b/metadata/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml
index 98bd7af6..98bd7af6 100644
--- a/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml
+++ b/metadata/swamid-2.0/login.ezproxy-test.its.uu.se-login.xml
diff --git a/swamid-2.0/login.ezproxy.its.uu.se-login.xml b/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
index a71f02d9..a71f02d9 100644
--- a/swamid-2.0/login.ezproxy.its.uu.se-login.xml
+++ b/metadata/swamid-2.0/login.ezproxy.its.uu.se-login.xml
diff --git a/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml b/metadata/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml
index 7aaed575..7aaed575 100644
--- a/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/login.proxy.lib.kth.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/login.quicksearch.se-AuthServices.xml b/metadata/swamid-2.0/login.quicksearch.se-AuthServices.xml
index 7f66fa01..7f66fa01 100644
--- a/swamid-2.0/login.quicksearch.se-AuthServices.xml
+++ b/metadata/swamid-2.0/login.quicksearch.se-AuthServices.xml
diff --git a/swamid-2.0/login.sto3.safespring.com-shibboleth.xml b/metadata/swamid-2.0/login.sto3.safespring.com-shibboleth.xml
index ece7e135..ece7e135 100644
--- a/swamid-2.0/login.sto3.safespring.com-shibboleth.xml
+++ b/metadata/swamid-2.0/login.sto3.safespring.com-shibboleth.xml
diff --git a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml b/metadata/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
index a282223d..a282223d 100644
--- a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
+++ b/metadata/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
diff --git a/swamid-2.0/ltu.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
index 27be1d4d..27be1d4d 100644
--- a/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/lu.beta.instructure.com-saml2.xml b/metadata/swamid-2.0/lu.beta.instructure.com-saml2.xml
index 7eb81a0b..7eb81a0b 100644
--- a/swamid-2.0/lu.beta.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/lu.beta.instructure.com-saml2.xml
diff --git a/swamid-2.0/lu.test.instructure.com-saml2.xml b/metadata/swamid-2.0/lu.test.instructure.com-saml2.xml
index 6b2b37c4..6b2b37c4 100644
--- a/swamid-2.0/lu.test.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/lu.test.instructure.com-saml2.xml
diff --git a/swamid-2.0/luvit.education.lu.se-shibboleth.xml b/metadata/swamid-2.0/luvit.education.lu.se-shibboleth.xml
index 030cd5d0..030cd5d0 100644
--- a/swamid-2.0/luvit.education.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/luvit.education.lu.se-shibboleth.xml
diff --git a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml b/metadata/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
index 27d721b3..27d721b3 100644
--- a/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/luvittest1.education.lu.se-shibboleth.xml
diff --git a/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml
index 4e208c8a..4e208c8a 100644
--- a/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml
diff --git a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
index 03401205..03401205 100644
--- a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/mdu-nav.cnaas.sunet.se.xml
diff --git a/swamid-2.0/mdu-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/mdu-ni.cnaas.sunet.se.xml
index 0023e912..0023e912 100644
--- a/swamid-2.0/mdu-ni.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/mdu-ni.cnaas.sunet.se.xml
diff --git a/swamid-2.0/medlem.chalmersstudentkar.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.chalmersstudentkar.se-auth-saml-metadata.xml
index c165c67d..c165c67d 100644
--- a/swamid-2.0/medlem.chalmersstudentkar.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.chalmersstudentkar.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.consensus.liu.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.consensus.liu.se-auth-saml-metadata.xml
index 163ef0c6..163ef0c6 100644
--- a/swamid-2.0/medlem.consensus.liu.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.consensus.liu.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.dalastudent.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.dalastudent.se-auth-saml-metadata.xml
index cba8d865..cba8d865 100644
--- a/swamid-2.0/medlem.dalastudent.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.dalastudent.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml
index c71e0215..c71e0215 100644
--- a/swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.disk.su.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml
index 38b73807..38b73807 100644
--- a/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.gotastudentkar.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.konstkaren.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.konstkaren.se-auth-saml-metadata.xml
index 6d85bc86..6d85bc86 100644
--- a/swamid-2.0/medlem.konstkaren.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.konstkaren.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.linnek.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.linnek.se-auth-saml-metadata.xml
index 6d92bd70..6d92bd70 100644
--- a/swamid-2.0/medlem.linnek.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.linnek.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.lintek.liu.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.lintek.liu.se-auth-saml-metadata.xml
index 3e8b5c47..3e8b5c47 100644
--- a/swamid-2.0/medlem.lintek.liu.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.lintek.liu.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml
index 714f14f5..714f14f5 100644
--- a/swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.ntkumea.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml
index 46bded5c..46bded5c 100644
--- a/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.saks.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.stuff.liu.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.stuff.liu.se-auth-saml-metadata.xml
index d0c46c0a..d0c46c0a 100644
--- a/swamid-2.0/medlem.stuff.liu.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.stuff.liu.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.sus.su.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.sus.su.se-auth-saml-metadata.xml
index f176c1ff..f176c1ff 100644
--- a/swamid-2.0/medlem.sus.su.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.sus.su.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/medlem.tlth.se-auth-saml-metadata.xml b/metadata/swamid-2.0/medlem.tlth.se-auth-saml-metadata.xml
index 8e93834f..8e93834f 100644
--- a/swamid-2.0/medlem.tlth.se-auth-saml-metadata.xml
+++ b/metadata/swamid-2.0/medlem.tlth.se-auth-saml-metadata.xml
diff --git a/swamid-2.0/meta2.eduroam.se.xml b/metadata/swamid-2.0/meta2.eduroam.se.xml
index 08aaf799..08aaf799 100644
--- a/swamid-2.0/meta2.eduroam.se.xml
+++ b/metadata/swamid-2.0/meta2.eduroam.se.xml
diff --git a/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml b/metadata/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml
index f2b5c4fa..f2b5c4fa 100644
--- a/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/metadata.qa.swamid.se-shibboleth.xml b/metadata/swamid-2.0/metadata.qa.swamid.se-shibboleth.xml
index 4cdc5e5c..4cdc5e5c 100644
--- a/swamid-2.0/metadata.qa.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/metadata.qa.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/metadata.swamid.se-shibboleth.xml b/metadata/swamid-2.0/metadata.swamid.se-shibboleth.xml
index 5242283e..5242283e 100644
--- a/swamid-2.0/metadata.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/metadata.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/mfa-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
index 629a1a0b..629a1a0b 100644
--- a/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
index 17be7a1b..17be7a1b 100644
--- a/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml
index c23f55b5..c23f55b5 100644
--- a/swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml
index ad5a73ec..ad5a73ec 100644
--- a/swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml b/metadata/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml
index 7147df69..7147df69 100644
--- a/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mintentateknat.kvk.uu.se-shibboleth.xml
diff --git a/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml
index 8b803248..8b803248 100644
--- a/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/misp-saas-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-2.0/misp.cert.sunet.se-shibboleth.xml b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
index abc47a48..abc47a48 100644
--- a/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/misp.cert.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/mittkau.sae.kau.se-shibboleth.xml b/metadata/swamid-2.0/mittkau.sae.kau.se-shibboleth.xml
index 92cf40ba..92cf40ba 100644
--- a/swamid-2.0/mittkau.sae.kau.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mittkau.sae.kau.se-shibboleth.xml
diff --git a/swamid-2.0/miunid.miun.se-saml-miun-metadata.xml b/metadata/swamid-2.0/miunid.miun.se-saml-miun-metadata.xml
index 50f6b7e7..50f6b7e7 100644
--- a/swamid-2.0/miunid.miun.se-saml-miun-metadata.xml
+++ b/metadata/swamid-2.0/miunid.miun.se-saml-miun-metadata.xml
diff --git a/swamid-2.0/monitor.drive.sunet.se.xml b/metadata/swamid-2.0/monitor.drive.sunet.se.xml
index afd31911..afd31911 100644
--- a/swamid-2.0/monitor.drive.sunet.se.xml
+++ b/metadata/swamid-2.0/monitor.drive.sunet.se.xml
diff --git a/swamid-2.0/monitor.drive.test.sunet.se.xml b/metadata/swamid-2.0/monitor.drive.test.sunet.se.xml
index 23962412..23962412 100644
--- a/swamid-2.0/monitor.drive.test.sunet.se.xml
+++ b/metadata/swamid-2.0/monitor.drive.test.sunet.se.xml
diff --git a/swamid-2.0/monitor.social.sunet.se.xml b/metadata/swamid-2.0/monitor.social.sunet.se.xml
index 459b6beb..459b6beb 100644
--- a/swamid-2.0/monitor.social.sunet.se.xml
+++ b/metadata/swamid-2.0/monitor.social.sunet.se.xml
diff --git a/swamid-2.0/monitor.swamid.se.xml b/metadata/swamid-2.0/monitor.swamid.se.xml
index b2a1a73a..b2a1a73a 100644
--- a/swamid-2.0/monitor.swamid.se.xml
+++ b/metadata/swamid-2.0/monitor.swamid.se.xml
diff --git a/swamid-2.0/monitor.test.swamid.se.xml b/metadata/swamid-2.0/monitor.test.swamid.se.xml
index d410d54b..d410d54b 100644
--- a/swamid-2.0/monitor.test.swamid.se.xml
+++ b/metadata/swamid-2.0/monitor.test.swamid.se.xml
diff --git a/swamid-2.0/moodle.med.lu.se-shibboleth.xml b/metadata/swamid-2.0/moodle.med.lu.se-shibboleth.xml
index ed404be1..ed404be1 100644
--- a/swamid-2.0/moodle.med.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/moodle.med.lu.se-shibboleth.xml
diff --git a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml b/metadata/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
index 2872b3c7..2872b3c7 100644
--- a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
diff --git a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index bb530888..bb530888 100644
--- a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/my.ilabsolutions.com.xml b/metadata/swamid-2.0/my.ilabsolutions.com.xml
index 490e049c..490e049c 100644
--- a/swamid-2.0/my.ilabsolutions.com.xml
+++ b/metadata/swamid-2.0/my.ilabsolutions.com.xml
diff --git a/swamid-2.0/myaccount.chalmers.se.xml b/metadata/swamid-2.0/myaccount.chalmers.se.xml
index b5bcac29..b5bcac29 100644
--- a/swamid-2.0/myaccount.chalmers.se.xml
+++ b/metadata/swamid-2.0/myaccount.chalmers.se.xml
diff --git a/swamid-2.0/mystery.cs.lth.se-shibboleth.xml b/metadata/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
index 620ba833..620ba833 100644
--- a/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
diff --git a/swamid-2.0/nai.uu.se.xml b/metadata/swamid-2.0/nai.uu.se.xml
index fc4a1c13..fc4a1c13 100644
--- a/swamid-2.0/nai.uu.se.xml
+++ b/metadata/swamid-2.0/nai.uu.se.xml
diff --git a/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml b/metadata/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
index 8ba8bfc3..8ba8bfc3 100644
--- a/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
+++ b/metadata/swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml
diff --git a/swamid-2.0/nfg.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/nfg.su.se-Shibboleth.sso.xml
index f3262f6b..f3262f6b 100644
--- a/swamid-2.0/nfg.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/nfg.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata-.xml b/metadata/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
index 4590b7f9..4590b7f9 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
diff --git a/swamid-2.0/ni.sunet.se-saml2-metadata-.xml b/metadata/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
index 87fd5b3d..87fd5b3d 100644
--- a/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
diff --git a/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
index ef225bea..ef225bea 100644
--- a/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/noec.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml b/metadata/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml
index bdd66b56..bdd66b56 100644
--- a/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/norpan-keycloak.cnaas.sunet.se.xml
diff --git a/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
index 2ea4228d..2ea4228d 100644
--- a/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml
index 561f70b1..561f70b1 100644
--- a/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml
diff --git a/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml b/metadata/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml
index 87e90f1a..87e90f1a 100644
--- a/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml b/metadata/swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml
index 97c76aae..97c76aae 100644
--- a/swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml
+++ b/metadata/swamid-2.0/nyainloggning-test.hv.se-Shibboleth.xml
diff --git a/swamid-2.0/nyainloggning.hv.se-Shibboleth.xml b/metadata/swamid-2.0/nyainloggning.hv.se-Shibboleth.xml
index 6af3c806..6af3c806 100644
--- a/swamid-2.0/nyainloggning.hv.se-Shibboleth.xml
+++ b/metadata/swamid-2.0/nyainloggning.hv.se-Shibboleth.xml
diff --git a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
index 6e118b46..6e118b46 100644
--- a/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/outscan-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml b/metadata/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml
index c2854b9b..c2854b9b 100644
--- a/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml
+++ b/metadata/swamid-2.0/passportprod.lu.se-activateaccount-shibboleth.xml
diff --git a/swamid-2.0/permit-eu.caleaccess.com.xml b/metadata/swamid-2.0/permit-eu.caleaccess.com.xml
index 3b7b7982..3b7b7982 100644
--- a/swamid-2.0/permit-eu.caleaccess.com.xml
+++ b/metadata/swamid-2.0/permit-eu.caleaccess.com.xml
diff --git a/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
index b7610398..b7610398 100644
--- a/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/personalized.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml
index e722b7da..e722b7da 100644
--- a/swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/pingpong.hb.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/play.chalmers.se.xml b/metadata/swamid-2.0/play.chalmers.se.xml
index 1426c852..1426c852 100644
--- a/swamid-2.0/play.chalmers.se.xml
+++ b/metadata/swamid-2.0/play.chalmers.se.xml
diff --git a/swamid-2.0/play.fhs.se.xml b/metadata/swamid-2.0/play.fhs.se.xml
index 6d16494a..6d16494a 100644
--- a/swamid-2.0/play.fhs.se.xml
+++ b/metadata/swamid-2.0/play.fhs.se.xml
diff --git a/swamid-2.0/play.gih.se.xml b/metadata/swamid-2.0/play.gih.se.xml
index 70c9faec..70c9faec 100644
--- a/swamid-2.0/play.gih.se.xml
+++ b/metadata/swamid-2.0/play.gih.se.xml
diff --git a/swamid-2.0/play.gu.se.xml b/metadata/swamid-2.0/play.gu.se.xml
index dc0cbe61..dc0cbe61 100644
--- a/swamid-2.0/play.gu.se.xml
+++ b/metadata/swamid-2.0/play.gu.se.xml
diff --git a/swamid-2.0/play.hb.se.xml b/metadata/swamid-2.0/play.hb.se.xml
index 6fa1b91c..6fa1b91c 100644
--- a/swamid-2.0/play.hb.se.xml
+++ b/metadata/swamid-2.0/play.hb.se.xml
diff --git a/swamid-2.0/play.hhs.se.xml b/metadata/swamid-2.0/play.hhs.se.xml
index 74201b3b..74201b3b 100644
--- a/swamid-2.0/play.hhs.se.xml
+++ b/metadata/swamid-2.0/play.hhs.se.xml
diff --git a/swamid-2.0/play.hig.se.xml b/metadata/swamid-2.0/play.hig.se.xml
index eead0bc7..eead0bc7 100644
--- a/swamid-2.0/play.hig.se.xml
+++ b/metadata/swamid-2.0/play.hig.se.xml
diff --git a/swamid-2.0/play.his.se.xml b/metadata/swamid-2.0/play.his.se.xml
index df5c906c..df5c906c 100644
--- a/swamid-2.0/play.his.se.xml
+++ b/metadata/swamid-2.0/play.his.se.xml
diff --git a/swamid-2.0/play.ju.se.xml b/metadata/swamid-2.0/play.ju.se.xml
index 83a47296..83a47296 100644
--- a/swamid-2.0/play.ju.se.xml
+++ b/metadata/swamid-2.0/play.ju.se.xml
diff --git a/swamid-2.0/play.ki.se.xml b/metadata/swamid-2.0/play.ki.se.xml
index bae3c9f6..bae3c9f6 100644
--- a/swamid-2.0/play.ki.se.xml
+++ b/metadata/swamid-2.0/play.ki.se.xml
diff --git a/swamid-2.0/play.konstfack.se.xml b/metadata/swamid-2.0/play.konstfack.se.xml
index 7e3bafed..7e3bafed 100644
--- a/swamid-2.0/play.konstfack.se.xml
+++ b/metadata/swamid-2.0/play.konstfack.se.xml
diff --git a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml b/metadata/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
index bf733a85..bf733a85 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
+++ b/metadata/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
diff --git a/swamid-2.0/play.ltu.se.xml b/metadata/swamid-2.0/play.ltu.se.xml
index c9090178..c9090178 100644
--- a/swamid-2.0/play.ltu.se.xml
+++ b/metadata/swamid-2.0/play.ltu.se.xml
diff --git a/swamid-2.0/play.mdh.se.xml b/metadata/swamid-2.0/play.mdh.se.xml
index 73c061a2..73c061a2 100644
--- a/swamid-2.0/play.mdh.se.xml
+++ b/metadata/swamid-2.0/play.mdh.se.xml
diff --git a/swamid-2.0/play.mdu.se.xml b/metadata/swamid-2.0/play.mdu.se.xml
index 481f98be..481f98be 100644
--- a/swamid-2.0/play.mdu.se.xml
+++ b/metadata/swamid-2.0/play.mdu.se.xml
diff --git a/swamid-2.0/play.miun.se.xml b/metadata/swamid-2.0/play.miun.se.xml
index cd73de2a..cd73de2a 100644
--- a/swamid-2.0/play.miun.se.xml
+++ b/metadata/swamid-2.0/play.miun.se.xml
diff --git a/swamid-2.0/play.sh.se.xml b/metadata/swamid-2.0/play.sh.se.xml
index 3aac3490..3aac3490 100644
--- a/swamid-2.0/play.sh.se.xml
+++ b/metadata/swamid-2.0/play.sh.se.xml
diff --git a/swamid-2.0/play.shh.se.xml b/metadata/swamid-2.0/play.shh.se.xml
index cb74905b..cb74905b 100644
--- a/swamid-2.0/play.shh.se.xml
+++ b/metadata/swamid-2.0/play.shh.se.xml
diff --git a/swamid-2.0/play.sunet.se.xml b/metadata/swamid-2.0/play.sunet.se.xml
index 8e9273d8..8e9273d8 100644
--- a/swamid-2.0/play.sunet.se.xml
+++ b/metadata/swamid-2.0/play.sunet.se.xml
diff --git a/swamid-2.0/play.umu.se.xml b/metadata/swamid-2.0/play.umu.se.xml
index 562df894..562df894 100644
--- a/swamid-2.0/play.umu.se.xml
+++ b/metadata/swamid-2.0/play.umu.se.xml
diff --git a/swamid-2.0/play.vr.se.xml b/metadata/swamid-2.0/play.vr.se.xml
index aa66a5ba..aa66a5ba 100644
--- a/swamid-2.0/play.vr.se.xml
+++ b/metadata/swamid-2.0/play.vr.se.xml
diff --git a/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
index e9d0422d..e9d0422d 100644
--- a/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
diff --git a/swamid-2.0/portalki.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portalki.onricoh.se-shibboleth.xml
index d47576cf..d47576cf 100644
--- a/swamid-2.0/portalki.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portalki.onricoh.se-shibboleth.xml
diff --git a/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
index 29b7cb32..29b7cb32 100644
--- a/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
diff --git a/swamid-2.0/portaluu.onricoh.se-shibboleth.xml b/metadata/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
index 0fbd7473..0fbd7473 100644
--- a/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
diff --git a/swamid-2.0/prep.math.su.se-shibboleth.xml b/metadata/swamid-2.0/prep.math.su.se-shibboleth.xml
index 621024c5..621024c5 100644
--- a/swamid-2.0/prep.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/prep.math.su.se-shibboleth.xml
diff --git a/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml
index 8a0d6233..8a0d6233 100644
--- a/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primo-latefee.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/primula.lnu.se-shibboleth.xml b/metadata/swamid-2.0/primula.lnu.se-shibboleth.xml
index 0a27d16a..0a27d16a 100644
--- a/swamid-2.0/primula.lnu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primula.lnu.se-shibboleth.xml
diff --git a/swamid-2.0/primula.oru.se-shibboleth.xml b/metadata/swamid-2.0/primula.oru.se-shibboleth.xml
index 88404f13..88404f13 100644
--- a/swamid-2.0/primula.oru.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primula.oru.se-shibboleth.xml
diff --git a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml b/metadata/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
index dc3a9163..dc3a9163 100644
--- a/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primulaweb-ft.uadm.uu.se-shibboleth.xml
diff --git a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml b/metadata/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
index acbff43f..acbff43f 100644
--- a/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primulaweb-fu.uadm.uu.se-shibboleth.xml
diff --git a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml b/metadata/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
index b74fe751..b74fe751 100644
--- a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
diff --git a/swamid-2.0/produktwebb.uu.se-shibboleth.xml b/metadata/swamid-2.0/produktwebb.uu.se-shibboleth.xml
index 09deec7b..09deec7b 100644
--- a/swamid-2.0/produktwebb.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/produktwebb.uu.se-shibboleth.xml
diff --git a/swamid-2.0/program.portal.chalmers.se.xml b/metadata/swamid-2.0/program.portal.chalmers.se.xml
index 1d6e6999..1d6e6999 100644
--- a/swamid-2.0/program.portal.chalmers.se.xml
+++ b/metadata/swamid-2.0/program.portal.chalmers.se.xml
diff --git a/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
index 2106f93e..2106f93e 100644
--- a/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/pseudonymous.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
index f702f497..f702f497 100644
--- a/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/rands.release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/rb.lbic.lu.se-.xml b/metadata/swamid-2.0/rb.lbic.lu.se-.xml
index a0fcd634..a0fcd634 100644
--- a/swamid-2.0/rb.lbic.lu.se-.xml
+++ b/metadata/swamid-2.0/rb.lbic.lu.se-.xml
diff --git a/swamid-2.0/redcap.ki.se-shibboleth.xml b/metadata/swamid-2.0/redcap.ki.se-shibboleth.xml
index 4d67bc03..4d67bc03 100644
--- a/swamid-2.0/redcap.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/redcap.ki.se-shibboleth.xml
diff --git a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml b/metadata/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
index 1a152b5f..1a152b5f 100644
--- a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
diff --git a/swamid-2.0/rehab.test.uu.se-TicketServer-.xml b/metadata/swamid-2.0/rehab.test.uu.se-TicketServer-.xml
index 701a0e4e..701a0e4e 100644
--- a/swamid-2.0/rehab.test.uu.se-TicketServer-.xml
+++ b/metadata/swamid-2.0/rehab.test.uu.se-TicketServer-.xml
diff --git a/swamid-2.0/rehab.uu.se-TicketServer-.xml b/metadata/swamid-2.0/rehab.uu.se-TicketServer-.xml
index 6c7bb90c..6c7bb90c 100644
--- a/swamid-2.0/rehab.uu.se-TicketServer-.xml
+++ b/metadata/swamid-2.0/rehab.uu.se-TicketServer-.xml
diff --git a/swamid-2.0/release-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/release-check.swamid.se-shibboleth.xml
index 1ef6525b..1ef6525b 100644
--- a/swamid-2.0/release-check.swamid.se-shibboleth.xml
+++ b/metadata/swamid-2.0/release-check.swamid.se-shibboleth.xml
diff --git a/swamid-2.0/researchinformation.ki.se.xml b/metadata/swamid-2.0/researchinformation.ki.se.xml
index a8de05b6..a8de05b6 100644
--- a/swamid-2.0/researchinformation.ki.se.xml
+++ b/metadata/swamid-2.0/researchinformation.ki.se.xml
diff --git a/swamid-2.0/reset.hig.se-shibboleth.xml b/metadata/swamid-2.0/reset.hig.se-shibboleth.xml
index 092aec83..092aec83 100644
--- a/swamid-2.0/reset.hig.se-shibboleth.xml
+++ b/metadata/swamid-2.0/reset.hig.se-shibboleth.xml
diff --git a/swamid-2.0/rps.kau.se.xml b/metadata/swamid-2.0/rps.kau.se.xml
index 2e823af8..2e823af8 100644
--- a/swamid-2.0/rps.kau.se.xml
+++ b/metadata/swamid-2.0/rps.kau.se.xml
diff --git a/swamid-2.0/rt-test.sunet.se-shibboleth.xml b/metadata/swamid-2.0/rt-test.sunet.se-shibboleth.xml
index bebcbd4e..bebcbd4e 100644
--- a/swamid-2.0/rt-test.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/rt-test.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/rt.sunet.se-shibboleth.xml b/metadata/swamid-2.0/rt.sunet.se-shibboleth.xml
index 1c7176fe..1c7176fe 100644
--- a/swamid-2.0/rt.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/rt.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/sam.control.lth.se-shibboleth.xml b/metadata/swamid-2.0/sam.control.lth.se-shibboleth.xml
index dbc4181b..dbc4181b 100644
--- a/swamid-2.0/sam.control.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sam.control.lth.se-shibboleth.xml
diff --git a/swamid-2.0/sam.cs.lth.se-shibboleth.xml b/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml
index 373a2ac6..373a2ac6 100644
--- a/swamid-2.0/sam.cs.lth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sam.cs.lth.se-shibboleth.xml
diff --git a/swamid-2.0/saml.account-utv.hh.se-shibboleth.xml b/metadata/swamid-2.0/saml.account-utv.hh.se-shibboleth.xml
index d3071cc6..d3071cc6 100644
--- a/swamid-2.0/saml.account-utv.hh.se-shibboleth.xml
+++ b/metadata/swamid-2.0/saml.account-utv.hh.se-shibboleth.xml
diff --git a/swamid-2.0/sandbox03-eu.alma.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/sandbox03-eu.alma.exlibrisgroup.com-mng-login.xml
index 78f00cfd..78f00cfd 100644
--- a/swamid-2.0/sandbox03-eu.alma.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/sandbox03-eu.alma.exlibrisgroup.com-mng-login.xml
diff --git a/swamid-2.0/sandbox03-eu.primo.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/sandbox03-eu.primo.exlibrisgroup.com-mng-login.xml
index f79e690f..f79e690f 100644
--- a/swamid-2.0/sandbox03-eu.primo.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/sandbox03-eu.primo.exlibrisgroup.com-mng-login.xml
diff --git a/swamid-2.0/sdauth.sciencedirect.com-.xml b/metadata/swamid-2.0/sdauth.sciencedirect.com-.xml
index cc73cd8f..cc73cd8f 100644
--- a/swamid-2.0/sdauth.sciencedirect.com-.xml
+++ b/metadata/swamid-2.0/sdauth.sciencedirect.com-.xml
diff --git a/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml
index 4aaee688..4aaee688 100644
--- a/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-hh-shibboleth.moveon4.de-shibboleth.xml
diff --git a/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
index 53c67c67..53c67c67 100644
--- a/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml
diff --git a/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
index 6bc71651..6bc71651 100644
--- a/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
diff --git a/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml b/metadata/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
index 7b7c7696..7b7c7696 100644
--- a/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
+++ b/metadata/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
diff --git a/swamid-2.0/se.timeedit.net-chalmers-sp.xml b/metadata/swamid-2.0/se.timeedit.net-chalmers-sp.xml
index 7eb7e81a..7eb7e81a 100644
--- a/swamid-2.0/se.timeedit.net-chalmers-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-chalmers-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-fhs-staff.xml b/metadata/swamid-2.0/se.timeedit.net-fhs-staff.xml
index 622d833a..622d833a 100644
--- a/swamid-2.0/se.timeedit.net-fhs-staff.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-fhs-staff.xml
diff --git a/swamid-2.0/se.timeedit.net-fhs-stud.xml b/metadata/swamid-2.0/se.timeedit.net-fhs-stud.xml
index 663053dc..663053dc 100644
--- a/swamid-2.0/se.timeedit.net-fhs-stud.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-fhs-stud.xml
diff --git a/swamid-2.0/se.timeedit.net-hhs-staff.xml b/metadata/swamid-2.0/se.timeedit.net-hhs-staff.xml
index 93feb7db..93feb7db 100644
--- a/swamid-2.0/se.timeedit.net-hhs-staff.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-hhs-staff.xml
diff --git a/swamid-2.0/se.timeedit.net-hhs-stud.xml b/metadata/swamid-2.0/se.timeedit.net-hhs-stud.xml
index e160ca60..e160ca60 100644
--- a/swamid-2.0/se.timeedit.net-hhs-stud.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-hhs-stud.xml
diff --git a/swamid-2.0/se.timeedit.net-kau-employee-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
index 8fe1accf..8fe1accf 100644
--- a/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-kau-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
index c0bd1c10..c0bd1c10 100644
--- a/swamid-2.0/se.timeedit.net-kau-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kau-student-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-ki.xml b/metadata/swamid-2.0/se.timeedit.net-ki.xml
index 949969a9..949969a9 100644
--- a/swamid-2.0/se.timeedit.net-ki.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-ki.xml
diff --git a/swamid-2.0/se.timeedit.net-kth-employee-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
index 00d67415..00d67415 100644
--- a/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-kth-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-kth-student-sp.xml
index f59a1ed3..f59a1ed3 100644
--- a/swamid-2.0/se.timeedit.net-kth-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-kth-student-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-liu-staff.xml b/metadata/swamid-2.0/se.timeedit.net-liu-staff.xml
index abec0227..abec0227 100644
--- a/swamid-2.0/se.timeedit.net-liu-staff.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-liu-staff.xml
diff --git a/swamid-2.0/se.timeedit.net-liu-stud.xml b/metadata/swamid-2.0/se.timeedit.net-liu-stud.xml
index fe8fe5c8..fe8fe5c8 100644
--- a/swamid-2.0/se.timeedit.net-liu-stud.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-liu-stud.xml
diff --git a/swamid-2.0/se.timeedit.net-lnu-employee-sp.xml b/metadata/swamid-2.0/se.timeedit.net-lnu-employee-sp.xml
index 7b628feb..7b628feb 100644
--- a/swamid-2.0/se.timeedit.net-lnu-employee-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-lnu-employee-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-lnu-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-lnu-student-sp.xml
index 200b7870..200b7870 100644
--- a/swamid-2.0/se.timeedit.net-lnu-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-lnu-student-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-lu-general-sp.xml b/metadata/swamid-2.0/se.timeedit.net-lu-general-sp.xml
index c9eb82e5..c9eb82e5 100644
--- a/swamid-2.0/se.timeedit.net-lu-general-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-lu-general-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-miun.xml b/metadata/swamid-2.0/se.timeedit.net-miun.xml
index 8cd72b84..8cd72b84 100644
--- a/swamid-2.0/se.timeedit.net-miun.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-miun.xml
diff --git a/swamid-2.0/se.timeedit.net-sh.xml b/metadata/swamid-2.0/se.timeedit.net-sh.xml
index 9314361e..9314361e 100644
--- a/swamid-2.0/se.timeedit.net-sh.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-sh.xml
diff --git a/swamid-2.0/se.timeedit.net-ssh-sp.xml b/metadata/swamid-2.0/se.timeedit.net-ssh-sp.xml
index abc297d7..abc297d7 100644
--- a/swamid-2.0/se.timeedit.net-ssh-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-ssh-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-su-employee-sp.xml b/metadata/swamid-2.0/se.timeedit.net-su-employee-sp.xml
index 8a4806c3..8a4806c3 100644
--- a/swamid-2.0/se.timeedit.net-su-employee-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-su-employee-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-su-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-su-student-sp.xml
index bcfaddc0..bcfaddc0 100644
--- a/swamid-2.0/se.timeedit.net-su-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-su-student-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml b/metadata/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
index c6664361..c6664361 100644
--- a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
diff --git a/swamid-2.0/se.timeedit.net-umu-student-sp.xml b/metadata/swamid-2.0/se.timeedit.net-umu-student-sp.xml
index a625e6fa..a625e6fa 100644
--- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml
+++ b/metadata/swamid-2.0/se.timeedit.net-umu-student-sp.xml
diff --git a/swamid-2.0/search.ub.uu.se-mng-login.xml b/metadata/swamid-2.0/search.ub.uu.se-mng-login.xml
index 4314b137..4314b137 100644
--- a/swamid-2.0/search.ub.uu.se-mng-login.xml
+++ b/metadata/swamid-2.0/search.ub.uu.se-mng-login.xml
diff --git a/swamid-2.0/secure.port.se-shibboleth.xml b/metadata/swamid-2.0/secure.port.se-shibboleth.xml
index 0266a26d..0266a26d 100644
--- a/swamid-2.0/secure.port.se-shibboleth.xml
+++ b/metadata/swamid-2.0/secure.port.se-shibboleth.xml
diff --git a/swamid-2.0/selfservice.hb.se-Shibboleth.xml b/metadata/swamid-2.0/selfservice.hb.se-Shibboleth.xml
index 68083609..68083609 100644
--- a/swamid-2.0/selfservice.hb.se-Shibboleth.xml
+++ b/metadata/swamid-2.0/selfservice.hb.se-Shibboleth.xml
diff --git a/swamid-2.0/service.projectplace.com-saml-metadata.xml.xml b/metadata/swamid-2.0/service.projectplace.com-saml-metadata.xml.xml
index 792a9c54..792a9c54 100644
--- a/swamid-2.0/service.projectplace.com-saml-metadata.xml.xml
+++ b/metadata/swamid-2.0/service.projectplace.com-saml-metadata.xml.xml
diff --git a/swamid-2.0/service4mobility.su.se-mobility_test.xml b/metadata/swamid-2.0/service4mobility.su.se-mobility_test.xml
index 29ba695a..29ba695a 100644
--- a/swamid-2.0/service4mobility.su.se-mobility_test.xml
+++ b/metadata/swamid-2.0/service4mobility.su.se-mobility_test.xml
diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/metadata/swamid-2.0/sesam.uu.se-shibboleth.xml
index 266e8b0b..266e8b0b 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sesam.uu.se-shibboleth.xml
diff --git a/swamid-2.0/sh-se.zoom.us.xml b/metadata/swamid-2.0/sh-se.zoom.us.xml
index 794ca9af..794ca9af 100644
--- a/swamid-2.0/sh-se.zoom.us.xml
+++ b/metadata/swamid-2.0/sh-se.zoom.us.xml
diff --git a/swamid-2.0/shibboleth.ebscohost.com.xml b/metadata/swamid-2.0/shibboleth.ebscohost.com.xml
index af550841..af550841 100644
--- a/swamid-2.0/shibboleth.ebscohost.com.xml
+++ b/metadata/swamid-2.0/shibboleth.ebscohost.com.xml
diff --git a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml b/metadata/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
index 6b92b966..6b92b966 100644
--- a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
+++ b/metadata/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/metadata/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index d4b258fb..d4b258fb 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/metadata/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
diff --git a/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml
index e6eca306..e6eca306 100644
--- a/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/shiny-stage.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/shiny.kib.ki.se-shibboleth.xml b/metadata/swamid-2.0/shiny.kib.ki.se-shibboleth.xml
index becbaba9..becbaba9 100644
--- a/swamid-2.0/shiny.kib.ki.se-shibboleth.xml
+++ b/metadata/swamid-2.0/shiny.kib.ki.se-shibboleth.xml
diff --git a/swamid-2.0/sig.idsec.se-shibboleth.xml b/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
index 77552ff7..77552ff7 100644
--- a/swamid-2.0/sig.idsec.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-shibboleth.xml
diff --git a/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml b/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
index 3024df76..3024df76 100644
--- a/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-sigserv-v2-sp.xml
diff --git a/swamid-2.0/sig.idsec.se-sigservice-dev.xml b/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
index 65e341a0..65e341a0 100644
--- a/swamid-2.0/sig.idsec.se-sigservice-dev.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-sigservice-dev.xml
diff --git a/swamid-2.0/sig.idsec.se-uas-sandbox.xml b/metadata/swamid-2.0/sig.idsec.se-uas-sandbox.xml
index 14f7e39d..14f7e39d 100644
--- a/swamid-2.0/sig.idsec.se-uas-sandbox.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-uas-sandbox.xml
diff --git a/swamid-2.0/sig.idsec.se-uas.xml b/metadata/swamid-2.0/sig.idsec.se-uas.xml
index c7a1cc3c..c7a1cc3c 100644
--- a/swamid-2.0/sig.idsec.se-uas.xml
+++ b/metadata/swamid-2.0/sig.idsec.se-uas.xml
diff --git a/swamid-2.0/sp-01.oru.se-shibboleth.xml b/metadata/swamid-2.0/sp-01.oru.se-shibboleth.xml
index c17df81a..c17df81a 100644
--- a/swamid-2.0/sp-01.oru.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sp-01.oru.se-shibboleth.xml
diff --git a/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml
index 7713cec9..7713cec9 100644
--- a/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/sp-test.it.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/sp.it.gu.se-shibboleth.xml b/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
index 6df40154..6df40154 100644
--- a/swamid-2.0/sp.it.gu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/sp.it.gu.se-shibboleth.xml
diff --git a/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml b/metadata/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
index 36fd71a8..36fd71a8 100644
--- a/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
+++ b/metadata/swamid-2.0/sp.saml.staging.ebbot.app-7c00c56e-9e4a-446a-b9f5-4f9bf63d3216-metadata.xml.xml
diff --git a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index b967efff..b967efff 100644
--- a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml b/metadata/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml
index c24e3b1b..c24e3b1b 100644
--- a/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/sri-test.sunet.se-api-saml2-metadata-.xml
diff --git a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml b/metadata/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
index 99769feb..99769feb 100644
--- a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
+++ b/metadata/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
diff --git a/swamid-2.0/sse.instructure.com-saml2.xml b/metadata/swamid-2.0/sse.instructure.com-saml2.xml
index 18f75fd6..18f75fd6 100644
--- a/swamid-2.0/sse.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/sse.instructure.com-saml2.xml
diff --git a/swamid-2.0/stage.math.su.se-shibboleth.xml b/metadata/swamid-2.0/stage.math.su.se-shibboleth.xml
index 6df7d991..6df7d991 100644
--- a/swamid-2.0/stage.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/stage.math.su.se-shibboleth.xml
diff --git a/swamid-2.0/staging.ilabsolutions.com.xml b/metadata/swamid-2.0/staging.ilabsolutions.com.xml
index 476cb1bd..476cb1bd 100644
--- a/swamid-2.0/staging.ilabsolutions.com.xml
+++ b/metadata/swamid-2.0/staging.ilabsolutions.com.xml
diff --git a/swamid-2.0/stark.kau.se-shibboleth.xml b/metadata/swamid-2.0/stark.kau.se-shibboleth.xml
index e09e3cb1..e09e3cb1 100644
--- a/swamid-2.0/stark.kau.se-shibboleth.xml
+++ b/metadata/swamid-2.0/stark.kau.se-shibboleth.xml
diff --git a/swamid-2.0/stipendier-test.test.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/stipendier-test.test.uu.se-Shibboleth.sso-Metadata.xml
index 8dac0001..8dac0001 100644
--- a/swamid-2.0/stipendier-test.test.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/stipendier-test.test.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/stipendier-utv.test.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/stipendier-utv.test.uu.se-Shibboleth.sso-Metadata.xml
index 9a497524..9a497524 100644
--- a/swamid-2.0/stipendier-utv.test.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/stipendier-utv.test.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml
index b8a78d5c..b8a78d5c 100644
--- a/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-2.0/stipendier.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml b/metadata/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml
index fcb11d2f..fcb11d2f 100644
--- a/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/sts.vinnova.se-adfs-services-trust.xml
diff --git a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index e14d7053..e14d7053 100644
--- a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
diff --git a/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
index f046443d..f046443d 100644
--- a/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml
diff --git a/swamid-2.0/student.test.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
index 4a4c19d5..4a4c19d5 100644
--- a/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.test.ladok.se-student-sp.xml
diff --git a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 1dc2d356..1dc2d356 100644
--- a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
diff --git a/swamid-2.0/su-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/su-graylog.cnaas.sunet.se.xml
index 58f2e529..58f2e529 100644
--- a/swamid-2.0/su-graylog.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/su-graylog.cnaas.sunet.se.xml
diff --git a/swamid-2.0/su-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/su-nav.cnaas.sunet.se.xml
index ad64309b..ad64309b 100644
--- a/swamid-2.0/su-nav.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/su-nav.cnaas.sunet.se.xml
diff --git a/swamid-2.0/su-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/su-ni.cnaas.sunet.se.xml
index 766fb21a..766fb21a 100644
--- a/swamid-2.0/su-ni.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/su-ni.cnaas.sunet.se.xml
diff --git a/swamid-2.0/sunet-office-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/sunet-office-ni.cnaas.sunet.se.xml
index 6c915644..6c915644 100644
--- a/swamid-2.0/sunet-office-ni.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/sunet-office-ni.cnaas.sunet.se.xml
diff --git a/swamid-2.0/sunet.instructure.com-saml2.xml b/metadata/swamid-2.0/sunet.instructure.com-saml2.xml
index 81d9deaf..81d9deaf 100644
--- a/swamid-2.0/sunet.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/sunet.instructure.com-saml2.xml
diff --git a/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml b/metadata/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
index 694554ef..694554ef 100644
--- a/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
+++ b/metadata/swamid-2.0/support-idp.led.ladok.se-proxy-sp-metadata.xml.xml
diff --git a/swamid-2.0/supr.naiss.se.xml b/metadata/swamid-2.0/supr.naiss.se.xml
index bac41e0f..bac41e0f 100644
--- a/swamid-2.0/supr.naiss.se.xml
+++ b/metadata/swamid-2.0/supr.naiss.se.xml
diff --git a/swamid-2.0/supr.snic.se.xml b/metadata/swamid-2.0/supr.snic.se.xml
index e6efdf2b..e6efdf2b 100644
--- a/swamid-2.0/supr.snic.se.xml
+++ b/metadata/swamid-2.0/supr.snic.se.xml
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml b/metadata/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml
index b6606707..b6606707 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml
+++ b/metadata/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-btj.xml
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml b/metadata/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml
index 48dbdd40..48dbdd40 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml
+++ b/metadata/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml b/metadata/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
index 6f118621..6f118621 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
+++ b/metadata/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
diff --git a/swamid-2.0/swamid-ki.microweb.se-.xml b/metadata/swamid-2.0/swamid-ki.microweb.se-.xml
index 9a048faf..9a048faf 100644
--- a/swamid-2.0/swamid-ki.microweb.se-.xml
+++ b/metadata/swamid-2.0/swamid-ki.microweb.se-.xml
diff --git a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml b/metadata/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
index f38602fd..f38602fd 100644
--- a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
diff --git a/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml b/metadata/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
index 88573f83..88573f83 100644
--- a/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
diff --git a/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml b/metadata/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
index 87de7004..87de7004 100644
--- a/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
diff --git a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml b/metadata/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index 60429f16..60429f16 100644
--- a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/test-admin.selma7.its.uu.se-Shibboleth.sso.xml b/metadata/swamid-2.0/test-admin.selma7.its.uu.se-Shibboleth.sso.xml
index 4ea32795..4ea32795 100644
--- a/swamid-2.0/test-admin.selma7.its.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/test-admin.selma7.its.uu.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/test-du.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
index 2acb6d72..2acb6d72 100644
--- a/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml b/metadata/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml
index e4d4010f..e4d4010f 100644
--- a/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml
+++ b/metadata/swamid-2.0/test-edusign.ed-integrations.com-shibboleth.xml
diff --git a/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml b/metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
index 1d43b34a..1d43b34a 100644
--- a/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
+++ b/metadata/swamid-2.0/test-examensansokan.portal.chalmers.se-ny.xml
diff --git a/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
index 275ebca4..275ebca4 100644
--- a/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test-isp.sae.kau.se-isptest.xml b/metadata/swamid-2.0/test-isp.sae.kau.se-isptest.xml
index f7f25532..f7f25532 100644
--- a/swamid-2.0/test-isp.sae.kau.se-isptest.xml
+++ b/metadata/swamid-2.0/test-isp.sae.kau.se-isptest.xml
diff --git a/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
index f71b8f3d..f71b8f3d 100644
--- a/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
index 496296bc..496296bc 100644
--- a/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
index 4b847479..4b847479 100644
--- a/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
index b00726ee..b00726ee 100644
--- a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml b/metadata/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml
index dd3175aa..dd3175aa 100644
--- a/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test-oru.hr.evry.se-shibboleth.xml
diff --git a/swamid-2.0/test.edusign.sunet.se-shibboleth.xml b/metadata/swamid-2.0/test.edusign.sunet.se-shibboleth.xml
index 4a31545e..4a31545e 100644
--- a/swamid-2.0/test.edusign.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test.edusign.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/test.gdb.vr.se.xml b/metadata/swamid-2.0/test.gdb.vr.se.xml
index 0925d6aa..0925d6aa 100644
--- a/swamid-2.0/test.gdb.vr.se.xml
+++ b/metadata/swamid-2.0/test.gdb.vr.se.xml
diff --git a/swamid-2.0/test.ki.elements.symplectic.org-.xml b/metadata/swamid-2.0/test.ki.elements.symplectic.org-.xml
index 4114b54b..4114b54b 100644
--- a/swamid-2.0/test.ki.elements.symplectic.org-.xml
+++ b/metadata/swamid-2.0/test.ki.elements.symplectic.org-.xml
diff --git a/swamid-2.0/test.play.gu.se.xml b/metadata/swamid-2.0/test.play.gu.se.xml
index d0fb2fed..d0fb2fed 100644
--- a/swamid-2.0/test.play.gu.se.xml
+++ b/metadata/swamid-2.0/test.play.gu.se.xml
diff --git a/swamid-2.0/test.valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
index 12992bf7..12992bf7 100644
--- a/swamid-2.0/test.valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/test.valda.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/ths.instructure.com-saml2.xml b/metadata/swamid-2.0/ths.instructure.com-saml2.xml
index abefa2c3..abefa2c3 100644
--- a/swamid-2.0/ths.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/ths.instructure.com-saml2.xml
diff --git a/swamid-2.0/tse-uu.sitevision.se.xml b/metadata/swamid-2.0/tse-uu.sitevision.se.xml
index 5a8949a7..5a8949a7 100644
--- a/swamid-2.0/tse-uu.sitevision.se.xml
+++ b/metadata/swamid-2.0/tse-uu.sitevision.se.xml
diff --git a/swamid-2.0/uhrporten.se-shibboleth.xml b/metadata/swamid-2.0/uhrporten.se-shibboleth.xml
index 1a0b91ab..1a0b91ab 100644
--- a/swamid-2.0/uhrporten.se-shibboleth.xml
+++ b/metadata/swamid-2.0/uhrporten.se-shibboleth.xml
diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/metadata/swamid-2.0/uppsala.instructure.com-saml2.xml
index 0326c824..0326c824 100644
--- a/swamid-2.0/uppsala.instructure.com-saml2.xml
+++ b/metadata/swamid-2.0/uppsala.instructure.com-saml2.xml
diff --git a/swamid-2.0/uraccess.net-shibboleth.xml b/metadata/swamid-2.0/uraccess.net-shibboleth.xml
index b280e06a..b280e06a 100644
--- a/swamid-2.0/uraccess.net-shibboleth.xml
+++ b/metadata/swamid-2.0/uraccess.net-shibboleth.xml
diff --git a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml b/metadata/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
index 79e5a40d..79e5a40d 100644
--- a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
+++ b/metadata/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
diff --git a/swamid-2.0/use-isof-intra.sitevision-cloud.se.xml b/metadata/swamid-2.0/use-isof-intra.sitevision-cloud.se.xml
index bc607248..bc607248 100644
--- a/swamid-2.0/use-isof-intra.sitevision-cloud.se.xml
+++ b/metadata/swamid-2.0/use-isof-intra.sitevision-cloud.se.xml
diff --git a/swamid-2.0/utmanande.math.su.se-shibboleth.xml b/metadata/swamid-2.0/utmanande.math.su.se-shibboleth.xml
index 19058ba8..19058ba8 100644
--- a/swamid-2.0/utmanande.math.su.se-shibboleth.xml
+++ b/metadata/swamid-2.0/utmanande.math.su.se-shibboleth.xml
diff --git a/swamid-2.0/uu-se.zoom.us.xml b/metadata/swamid-2.0/uu-se.zoom.us.xml
index f944a168..f944a168 100644
--- a/swamid-2.0/uu-se.zoom.us.xml
+++ b/metadata/swamid-2.0/uu-se.zoom.us.xml
diff --git a/swamid-2.0/uub.alma.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/uub.alma.exlibrisgroup.com-mng-login.xml
index 40fe31c1..40fe31c1 100644
--- a/swamid-2.0/uub.alma.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/uub.alma.exlibrisgroup.com-mng-login.xml
diff --git a/swamid-2.0/uub.primo.exlibrisgroup.com-mng-login.xml b/metadata/swamid-2.0/uub.primo.exlibrisgroup.com-mng-login.xml
index a229351c..a229351c 100644
--- a/swamid-2.0/uub.primo.exlibrisgroup.com-mng-login.xml
+++ b/metadata/swamid-2.0/uub.primo.exlibrisgroup.com-mng-login.xml
diff --git a/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml b/metadata/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
index aca38c12..aca38c12 100644
--- a/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
+++ b/metadata/swamid-2.0/v2.api.sto4.safedc.net-shibboleth.xml
diff --git a/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml b/metadata/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
index 13e927ef..13e927ef 100644
--- a/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
+++ b/metadata/swamid-2.0/v2.dashboard.sto1.safedc.net-shibboleth.xml
diff --git a/swamid-2.0/valda.uhr.se-shibboleth.xml b/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
index 59e2b5b3..59e2b5b3 100644
--- a/swamid-2.0/valda.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/valda.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/verify.sunet.se-shibboleth.xml b/metadata/swamid-2.0/verify.sunet.se-shibboleth.xml
index ab9c3077..ab9c3077 100644
--- a/swamid-2.0/verify.sunet.se-shibboleth.xml
+++ b/metadata/swamid-2.0/verify.sunet.se-shibboleth.xml
diff --git a/swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml
index 29e186a1..29e186a1 100644
--- a/swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfu-dev.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml
index 8d3b34f9..8d3b34f9 100644
--- a/swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfu-dev2.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml
index eea26880..eea26880 100644
--- a/swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfu-dev3.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu-dev4.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfu-dev4.su.se-Shibboleth.sso.xml
index b705ecf7..b705ecf7 100644
--- a/swamid-2.0/vfu-dev4.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfu-dev4.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml
index a08e1f01..a08e1f01 100644
--- a/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfu-test.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfu.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfu.su.se-Shibboleth.sso.xml
index 4cb5a478..4cb5a478 100644
--- a/swamid-2.0/vfu.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfu.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml
index e3bb6da6..e3bb6da6 100644
--- a/swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfusyd-dev.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
index c9c63da0..c9c63da0 100644
--- a/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfusyd-test.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml b/metadata/swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml
index 349077b5..349077b5 100644
--- a/swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-2.0/vfusyd.su.se-Shibboleth.sso.xml
diff --git a/swamid-2.0/vgrgu.port.se-shibboleth.xml b/metadata/swamid-2.0/vgrgu.port.se-shibboleth.xml
index 5521427d..5521427d 100644
--- a/swamid-2.0/vgrgu.port.se-shibboleth.xml
+++ b/metadata/swamid-2.0/vgrgu.port.se-shibboleth.xml
diff --git a/swamid-2.0/video.su.se.xml b/metadata/swamid-2.0/video.su.se.xml
index 3bf6e452..3bf6e452 100644
--- a/swamid-2.0/video.su.se.xml
+++ b/metadata/swamid-2.0/video.su.se.xml
diff --git a/swamid-2.0/visp-demo.humlab.umu.se.xml b/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
index 3a0b8170..3a0b8170 100644
--- a/swamid-2.0/visp-demo.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/visp-demo.humlab.umu.se.xml
diff --git a/swamid-2.0/visp.humlab.umu.se.xml b/metadata/swamid-2.0/visp.humlab.umu.se.xml
index 97212aa9..97212aa9 100644
--- a/swamid-2.0/visp.humlab.umu.se.xml
+++ b/metadata/swamid-2.0/visp.humlab.umu.se.xml
diff --git a/swamid-2.0/vr-graylog.cnaas.sunet.se.xml b/metadata/swamid-2.0/vr-graylog.cnaas.sunet.se.xml
index ca13ff5a..ca13ff5a 100644
--- a/swamid-2.0/vr-graylog.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/vr-graylog.cnaas.sunet.se.xml
diff --git a/swamid-2.0/vr-nav.cnaas.sunet.se.xml b/metadata/swamid-2.0/vr-nav.cnaas.sunet.se.xml
index c9d6e8b0..c9d6e8b0 100644
--- a/swamid-2.0/vr-nav.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/vr-nav.cnaas.sunet.se.xml
diff --git a/swamid-2.0/vr-ni.cnaas.sunet.se.xml b/metadata/swamid-2.0/vr-ni.cnaas.sunet.se.xml
index d688a3b7..d688a3b7 100644
--- a/swamid-2.0/vr-ni.cnaas.sunet.se.xml
+++ b/metadata/swamid-2.0/vr-ni.cnaas.sunet.se.xml
diff --git a/swamid-2.0/webkonto.student.hig.se-shibboleth.xml b/metadata/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
index 1a072b84..1a072b84 100644
--- a/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
+++ b/metadata/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
diff --git a/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml b/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
index bd868ee7..bd868ee7 100644
--- a/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
+++ b/metadata/swamid-2.0/weblogin2.test.uu.se-adfs-services-trust.xml
diff --git a/swamid-2.0/weblogon.ltu.se-shibboleth.xml b/metadata/swamid-2.0/weblogon.ltu.se-shibboleth.xml
index 38ede882..38ede882 100644
--- a/swamid-2.0/weblogon.ltu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/weblogon.ltu.se-shibboleth.xml
diff --git a/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml b/metadata/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml
index ad3d6585..ad3d6585 100644
--- a/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wg-onboard.lan.kth.se-shibboleth.xml
diff --git a/swamid-2.0/wiki.its.uu.se-shibboleth.xml b/metadata/swamid-2.0/wiki.its.uu.se-shibboleth.xml
index 1e1e0262..1e1e0262 100644
--- a/swamid-2.0/wiki.its.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wiki.its.uu.se-shibboleth.xml
diff --git a/swamid-2.0/wiki.pdc.kth.se.xml b/metadata/swamid-2.0/wiki.pdc.kth.se.xml
index ba57118d..ba57118d 100644
--- a/swamid-2.0/wiki.pdc.kth.se.xml
+++ b/metadata/swamid-2.0/wiki.pdc.kth.se.xml
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/metadata/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
index 1d388ddd..1d388ddd 100644
--- a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
diff --git a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml b/metadata/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
index 6da8425f..6da8425f 100644
--- a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
diff --git a/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml b/metadata/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
index c466326a..c466326a 100644
--- a/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
+++ b/metadata/swamid-2.0/wireguard.lan.kth.se-shibboleth.xml
diff --git a/swamid-2.0/www.alvin-portal.org-shibboleth.xml b/metadata/swamid-2.0/www.alvin-portal.org-shibboleth.xml
index 7ab7a324..7ab7a324 100644
--- a/swamid-2.0/www.alvin-portal.org-shibboleth.xml
+++ b/metadata/swamid-2.0/www.alvin-portal.org-shibboleth.xml
diff --git a/swamid-2.0/www.antagning.se-aws-sp.xml b/metadata/swamid-2.0/www.antagning.se-aws-sp.xml
index 6a2744bb..6a2744bb 100644
--- a/swamid-2.0/www.antagning.se-aws-sp.xml
+++ b/metadata/swamid-2.0/www.antagning.se-aws-sp.xml
diff --git a/swamid-2.0/www.cambro.umu.se-shibboleth.xml b/metadata/swamid-2.0/www.cambro.umu.se-shibboleth.xml
index f2c2917b..f2c2917b 100644
--- a/swamid-2.0/www.cambro.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.cambro.umu.se-shibboleth.xml
diff --git a/swamid-2.0/www.demo.antagning.se-aws-sp.xml b/metadata/swamid-2.0/www.demo.antagning.se-aws-sp.xml
index 70852aff..70852aff 100644
--- a/swamid-2.0/www.demo.antagning.se-aws-sp.xml
+++ b/metadata/swamid-2.0/www.demo.antagning.se-aws-sp.xml
diff --git a/swamid-2.0/www.demo.universityadmissions.se-aws-sp-en.xml b/metadata/swamid-2.0/www.demo.universityadmissions.se-aws-sp-en.xml
index 7e19825a..7e19825a 100644
--- a/swamid-2.0/www.demo.universityadmissions.se-aws-sp-en.xml
+++ b/metadata/swamid-2.0/www.demo.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-2.0/www.diva-portal.org-shibboleth.xml b/metadata/swamid-2.0/www.diva-portal.org-shibboleth.xml
index f0c37fba..f0c37fba 100644
--- a/swamid-2.0/www.diva-portal.org-shibboleth.xml
+++ b/metadata/swamid-2.0/www.diva-portal.org-shibboleth.xml
diff --git a/swamid-2.0/www.egencia.com-auth-v1.xml b/metadata/swamid-2.0/www.egencia.com-auth-v1.xml
index 546e4e22..546e4e22 100644
--- a/swamid-2.0/www.egencia.com-auth-v1.xml
+++ b/metadata/swamid-2.0/www.egencia.com-auth-v1.xml
diff --git a/swamid-2.0/www.hubbletest.antagning.se-aws-sp.xml b/metadata/swamid-2.0/www.hubbletest.antagning.se-aws-sp.xml
index 47d7ea21..47d7ea21 100644
--- a/swamid-2.0/www.hubbletest.antagning.se-aws-sp.xml
+++ b/metadata/swamid-2.0/www.hubbletest.antagning.se-aws-sp.xml
diff --git a/swamid-2.0/www.hubbletest.universityadmissions.se-aws-sp-en.xml b/metadata/swamid-2.0/www.hubbletest.universityadmissions.se-aws-sp-en.xml
index e2a73c8b..e2a73c8b 100644
--- a/swamid-2.0/www.hubbletest.universityadmissions.se-aws-sp-en.xml
+++ b/metadata/swamid-2.0/www.hubbletest.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
index 8eef42d4..8eef42d4 100644
--- a/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
+++ b/metadata/swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml
diff --git a/swamid-2.0/www.nais.uhr.se-shibboleth.xml b/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
index 9eabca46..9eabca46 100644
--- a/swamid-2.0/www.nais.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.nais.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/www.researchprofessional.com-shibboleth.xml b/metadata/swamid-2.0/www.researchprofessional.com-shibboleth.xml
index e136acb7..e136acb7 100644
--- a/swamid-2.0/www.researchprofessional.com-shibboleth.xml
+++ b/metadata/swamid-2.0/www.researchprofessional.com-shibboleth.xml
diff --git a/swamid-2.0/www.service4mobility.com-mobility_su_se.xml b/metadata/swamid-2.0/www.service4mobility.com-mobility_su_se.xml
index fd1a044f..fd1a044f 100644
--- a/swamid-2.0/www.service4mobility.com-mobility_su_se.xml
+++ b/metadata/swamid-2.0/www.service4mobility.com-mobility_su_se.xml
diff --git a/swamid-2.0/www.stage.antagning.se-aws-sp.xml b/metadata/swamid-2.0/www.stage.antagning.se-aws-sp.xml
index c0082307..c0082307 100644
--- a/swamid-2.0/www.stage.antagning.se-aws-sp.xml
+++ b/metadata/swamid-2.0/www.stage.antagning.se-aws-sp.xml
diff --git a/swamid-2.0/www.stage.universityadmissions.se-aws-sp-en.xml b/metadata/swamid-2.0/www.stage.universityadmissions.se-aws-sp-en.xml
index cf6de8b8..cf6de8b8 100644
--- a/swamid-2.0/www.stage.universityadmissions.se-aws-sp-en.xml
+++ b/metadata/swamid-2.0/www.stage.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
index d38c0766..d38c0766 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/metadata/swamid-2.0/www.student.ladok.se-student-sp.xml
diff --git a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml b/metadata/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
index 77fa935d..77fa935d 100644
--- a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
diff --git a/swamid-2.0/www.test.antagning.se-aws-sp.xml b/metadata/swamid-2.0/www.test.antagning.se-aws-sp.xml
index 42e9d341..42e9d341 100644
--- a/swamid-2.0/www.test.antagning.se-aws-sp.xml
+++ b/metadata/swamid-2.0/www.test.antagning.se-aws-sp.xml
diff --git a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml b/metadata/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
index 794cd813..794cd813 100644
--- a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
+++ b/metadata/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/metadata/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
index 3664c497..3664c497 100644
--- a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/metadata/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
diff --git a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml b/metadata/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
index 27ed48fe..27ed48fe 100644
--- a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
diff --git a/swamid-2.0/www2.uu.se.xml b/metadata/swamid-2.0/www2.uu.se.xml
index bb751355..bb751355 100644
--- a/swamid-2.0/www2.uu.se.xml
+++ b/metadata/swamid-2.0/www2.uu.se.xml
diff --git a/swamid-2.0/www3.kau.se-shibboleth.xml b/metadata/swamid-2.0/www3.kau.se-shibboleth.xml
index e6f9720c..e6f9720c 100644
--- a/swamid-2.0/www3.kau.se-shibboleth.xml
+++ b/metadata/swamid-2.0/www3.kau.se-shibboleth.xml
diff --git a/swamid-2.0/www4.kau.se-isp.xml b/metadata/swamid-2.0/www4.kau.se-isp.xml
index a5628471..a5628471 100644
--- a/swamid-2.0/www4.kau.se-isp.xml
+++ b/metadata/swamid-2.0/www4.kau.se-isp.xml
diff --git a/swamid-2.0/www7.kau.se-.xml b/metadata/swamid-2.0/www7.kau.se-.xml
index 346d35b1..346d35b1 100644
--- a/swamid-2.0/www7.kau.se-.xml
+++ b/metadata/swamid-2.0/www7.kau.se-.xml
diff --git a/swamid-2.0/zeus.slu.se-shibboleth.xml b/metadata/swamid-2.0/zeus.slu.se-shibboleth.xml
index 217148fe..217148fe 100644
--- a/swamid-2.0/zeus.slu.se-shibboleth.xml
+++ b/metadata/swamid-2.0/zeus.slu.se-shibboleth.xml
diff --git a/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml b/metadata/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
index 6caf2b0a..6caf2b0a 100644
--- a/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-discovery.mxml b/metadata/swamid-discovery.mxml
index bcc76784..bcc76784 100644
--- a/swamid-discovery.mxml
+++ b/metadata/swamid-discovery.mxml
diff --git a/swamid-edugain-1.0.mxml b/metadata/swamid-edugain-1.0.mxml
index 67cbded1..67cbded1 100644
--- a/swamid-edugain-1.0.mxml
+++ b/metadata/swamid-edugain-1.0.mxml
diff --git a/swamid-edugain-idp-1.0.mxml b/metadata/swamid-edugain-idp-1.0.mxml
index be2303c8..be2303c8 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/metadata/swamid-edugain-idp-1.0.mxml
diff --git a/swamid-edugain-sp-1.0.mxml b/metadata/swamid-edugain-sp-1.0.mxml
index 9c61c0a4..9c61c0a4 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/metadata/swamid-edugain-sp-1.0.mxml
diff --git a/swamid-edugain-testing-1.0.mxml b/metadata/swamid-edugain-testing-1.0.mxml
index 55639308..55639308 100644
--- a/swamid-edugain-testing-1.0.mxml
+++ b/metadata/swamid-edugain-testing-1.0.mxml
diff --git a/swamid-edugain/account.eciu.eu.xml b/metadata/swamid-edugain/account.eciu.eu.xml
index 9d484c99..9d484c99 100644
--- a/swamid-edugain/account.eciu.eu.xml
+++ b/metadata/swamid-edugain/account.eciu.eu.xml
diff --git a/swamid-edugain/account.test.eciu.eu.xml b/metadata/swamid-edugain/account.test.eciu.eu.xml
index a75e0432..a75e0432 100644
--- a/swamid-edugain/account.test.eciu.eu.xml
+++ b/metadata/swamid-edugain/account.test.eciu.eu.xml
diff --git a/swamid-edugain/adfs.hv.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
index 92e564ee..92e564ee 100644
--- a/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.hv.se-adfs-services-trust.xml
diff --git a/swamid-edugain/adfs.ju.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
index 400f6886..400f6886 100644
--- a/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.ju.se-adfs-services-trust.xml
diff --git a/swamid-edugain/adfs.kb.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.kb.se-adfs-services-trust.xml
index eb0750e1..eb0750e1 100644
--- a/swamid-edugain/adfs.kb.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.kb.se-adfs-services-trust.xml
diff --git a/swamid-edugain/adfs.rkh.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.rkh.se-adfs-services-trust.xml
index 352cabd9..352cabd9 100644
--- a/swamid-edugain/adfs.rkh.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.rkh.se-adfs-services-trust.xml
diff --git a/swamid-edugain/adfs.sp.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
index 000f71da..000f71da 100644
--- a/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.sp.se-adfs-services-trust.xml
diff --git a/swamid-edugain/adfs.umu.se-adfs-services-trust.xml b/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
index e99efec9..e99efec9 100644
--- a/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/adfs.umu.se-adfs-services-trust.xml
diff --git a/swamid-edugain/auth.asiaportal.info.xml b/metadata/swamid-edugain/auth.asiaportal.info.xml
index 425f5bd7..425f5bd7 100644
--- a/swamid-edugain/auth.asiaportal.info.xml
+++ b/metadata/swamid-edugain/auth.asiaportal.info.xml
diff --git a/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml b/metadata/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
index 2ac094c1..2ac094c1 100644
--- a/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
+++ b/metadata/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
diff --git a/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 009ab894..009ab894 100644
--- a/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-edugain/connect.eduid.se-sunet.xml b/metadata/swamid-edugain/connect.eduid.se-sunet.xml
index 38155c60..38155c60 100644
--- a/swamid-edugain/connect.eduid.se-sunet.xml
+++ b/metadata/swamid-edugain/connect.eduid.se-sunet.xml
diff --git a/swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.xml b/metadata/swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.xml
index 3eb08186..3eb08186 100644
--- a/swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/metadata/swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.xml
diff --git a/swamid-edugain/crowd.nordu.net-shibboleth.xml b/metadata/swamid-edugain/crowd.nordu.net-shibboleth.xml
index fd89ad19..fd89ad19 100644
--- a/swamid-edugain/crowd.nordu.net-shibboleth.xml
+++ b/metadata/swamid-edugain/crowd.nordu.net-shibboleth.xml
diff --git a/swamid-edugain/crowd.sunet.se-shibboleth.xml b/metadata/swamid-edugain/crowd.sunet.se-shibboleth.xml
index 73392372..73392372 100644
--- a/swamid-edugain/crowd.sunet.se-shibboleth.xml
+++ b/metadata/swamid-edugain/crowd.sunet.se-shibboleth.xml
diff --git a/swamid-edugain/demo.beta.seamlessaccess.org-shibboleth.xml b/metadata/swamid-edugain/demo.beta.seamlessaccess.org-shibboleth.xml
index 65fc0f36..65fc0f36 100644
--- a/swamid-edugain/demo.beta.seamlessaccess.org-shibboleth.xml
+++ b/metadata/swamid-edugain/demo.beta.seamlessaccess.org-shibboleth.xml
diff --git a/swamid-edugain/demo.seamlessaccess.org-shibboleth.xml b/metadata/swamid-edugain/demo.seamlessaccess.org-shibboleth.xml
index 3402c5a0..3402c5a0 100644
--- a/swamid-edugain/demo.seamlessaccess.org-shibboleth.xml
+++ b/metadata/swamid-edugain/demo.seamlessaccess.org-shibboleth.xml
diff --git a/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml b/metadata/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
index 3fbd12f8..3fbd12f8 100644
--- a/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
+++ b/metadata/swamid-edugain/drive-idp-proxy.sunet.se-sp.xml
diff --git a/swamid-edugain/edusign.sunet.se-shibboleth.xml b/metadata/swamid-edugain/edusign.sunet.se-shibboleth.xml
index 630e2ca0..630e2ca0 100644
--- a/swamid-edugain/edusign.sunet.se-shibboleth.xml
+++ b/metadata/swamid-edugain/edusign.sunet.se-shibboleth.xml
diff --git a/swamid-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml b/metadata/swamid-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml
index 91c2c238..91c2c238 100644
--- a/swamid-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml
+++ b/metadata/swamid-edugain/errorurl-sp-demo.swamid.se-shibboleth.xml
diff --git a/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml b/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
index 1a4fc966..1a4fc966 100644
--- a/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
diff --git a/swamid-edugain/federation.uniarts.se-adfs-services-trust.xml b/metadata/swamid-edugain/federation.uniarts.se-adfs-services-trust.xml
index 951bd91b..951bd91b 100644
--- a/swamid-edugain/federation.uniarts.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/federation.uniarts.se-adfs-services-trust.xml
diff --git a/swamid-edugain/fs.bth.se-adfs-services-trust.xml b/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
index 62f094aa..62f094aa 100644
--- a/swamid-edugain/fs.bth.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fs.bth.se-adfs-services-trust.xml
diff --git a/swamid-edugain/fs.liu.se-adfs-services-trust.xml b/metadata/swamid-edugain/fs.liu.se-adfs-services-trust.xml
index ba35b0c9..ba35b0c9 100644
--- a/swamid-edugain/fs.liu.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/fs.liu.se-adfs-services-trust.xml
diff --git a/swamid-edugain/gdb.vr.se.xml b/metadata/swamid-edugain/gdb.vr.se.xml
index 8bc19f0c..8bc19f0c 100644
--- a/swamid-edugain/gdb.vr.se.xml
+++ b/metadata/swamid-edugain/gdb.vr.se.xml
diff --git a/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml b/metadata/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
index c4db2007..c4db2007 100644
--- a/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
+++ b/metadata/swamid-edugain/gitlab.fysik.su.se-swamidproxy-gitlab.xml.xml
diff --git a/swamid-edugain/graylog.nordu.net-shibboleth.xml b/metadata/swamid-edugain/graylog.nordu.net-shibboleth.xml
index 2e6b1682..2e6b1682 100644
--- a/swamid-edugain/graylog.nordu.net-shibboleth.xml
+++ b/metadata/swamid-edugain/graylog.nordu.net-shibboleth.xml
diff --git a/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml b/metadata/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
index 18582672..18582672 100644
--- a/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
+++ b/metadata/swamid-edugain/idp-proxy.drive.test.sunet.se-sp.xml
diff --git a/swamid-edugain/idp-shib.slu.se-idp.xml b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
index f5c944d5..f5c944d5 100644
--- a/swamid-edugain/idp-shib.slu.se-idp.xml
+++ b/metadata/swamid-edugain/idp-shib.slu.se-idp.xml
diff --git a/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
index 5ebdc487..5ebdc487 100644
--- a/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp-v2.konstfack.se-adfs-services-trust.xml
diff --git a/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
index 78ed5964..78ed5964 100644
--- a/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp-v2.suni.se-adfs-services-trust.xml
diff --git a/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
index 7396ef74..7396ef74 100644
--- a/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp.chalmers.se-adfs-services-trust.xml
diff --git a/swamid-edugain/idp.esh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.esh.se-idp-shibboleth.xml
index 01723001..01723001 100644
--- a/swamid-edugain/idp.esh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.esh.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.hb.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hb.se-idp-shibboleth.xml
index 07e0c33d..07e0c33d 100644
--- a/swamid-edugain/idp.hb.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hb.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.hh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hh.se-idp-shibboleth.xml
index 1f4f8d0b..1f4f8d0b 100644
--- a/swamid-edugain/idp.hh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hh.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.his.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.his.se-idp-shibboleth.xml
index 1a5c69aa..1a5c69aa 100644
--- a/swamid-edugain/idp.his.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.his.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.hkr.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
index 31952a5c..31952a5c 100644
--- a/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.it.su.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
index 93ce4a14..93ce4a14 100644
--- a/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.it.su.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.kmh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.kmh.se-idp-shibboleth.xml
index 76352811..76352811 100644
--- a/swamid-edugain/idp.kmh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.kmh.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.kva.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.kva.se-idp-shibboleth.xml
index 733a3a47..733a3a47 100644
--- a/swamid-edugain/idp.kva.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.kva.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.lnu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
index 41db3c9a..41db3c9a 100644
--- a/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.lnu.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.ltu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.ltu.se-idp-shibboleth.xml
index b247b4a1..b247b4a1 100644
--- a/swamid-edugain/idp.ltu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.ltu.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.mah.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.mah.se-idp-shibboleth.xml
index d76c45c8..d76c45c8 100644
--- a/swamid-edugain/idp.mah.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.mah.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.mdh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
index 1b12d253..1b12d253 100644
--- a/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.mdh.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.nordu.net-idp-shibboleth.xml b/metadata/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
index 793b09b1..793b09b1 100644
--- a/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.nordu.net-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.oru.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.oru.se-idp-shibboleth.xml
index 4bb86edc..4bb86edc 100644
--- a/swamid-edugain/idp.oru.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.oru.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.sunet.se-idp.xml b/metadata/swamid-edugain/idp.sunet.se-idp.xml
index ba937a17..ba937a17 100644
--- a/swamid-edugain/idp.sunet.se-idp.xml
+++ b/metadata/swamid-edugain/idp.sunet.se-idp.xml
diff --git a/swamid-edugain/idp.ths.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.ths.se-idp-shibboleth.xml
index 16cb6dd8..16cb6dd8 100644
--- a/swamid-edugain/idp.ths.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.ths.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp.vr.se-adfs-services-trust.xml b/metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml
index 0c536cd2..0c536cd2 100644
--- a/swamid-edugain/idp.vr.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/idp.vr.se-adfs-services-trust.xml
diff --git a/swamid-edugain/idp01.gih.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp01.gih.se-idp-shibboleth.xml
index 089161ac..089161ac 100644
--- a/swamid-edugain/idp01.gih.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp01.gih.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp2.bth.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp2.bth.se-idp-shibboleth.xml
index 2173671b..2173671b 100644
--- a/swamid-edugain/idp2.bth.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp2.bth.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
index 3b8255c0..3b8255c0 100644
--- a/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp2.kkh.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp3.hig.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
index 4d9b6a6b..4d9b6a6b 100644
--- a/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp3.hig.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
index 12632e25..12632e25 100644
--- a/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp3.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml b/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
index 34286ff3..34286ff3 100644
--- a/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idpshibboleth.irf.se-idp-shibboleth.xml
diff --git a/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml b/metadata/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
index a8a1a3f3..a8a1a3f3 100644
--- a/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idpv4.lu.se-idp-shibboleth.xml
diff --git a/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
index 8828b4e4..8828b4e4 100644
--- a/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
+++ b/metadata/swamid-edugain/inacademia.org-metadata-inacademia-simple-validation.xml.xml
diff --git a/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml b/metadata/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
index 65140451..65140451 100644
--- a/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
+++ b/metadata/swamid-edugain/indico.fysik.su.se-Shibboleth.sso.xml
diff --git a/swamid-edugain/indico.nordu.net-mellon.xml b/metadata/swamid-edugain/indico.nordu.net-mellon.xml
index 04242c02..04242c02 100644
--- a/swamid-edugain/indico.nordu.net-mellon.xml
+++ b/metadata/swamid-edugain/indico.nordu.net-mellon.xml
diff --git a/swamid-edugain/indico.uu.se-shibboleth.xml b/metadata/swamid-edugain/indico.uu.se-shibboleth.xml
index d2bc0711..d2bc0711 100644
--- a/swamid-edugain/indico.uu.se-shibboleth.xml
+++ b/metadata/swamid-edugain/indico.uu.se-shibboleth.xml
diff --git a/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml b/metadata/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
index 45a948f2..45a948f2 100644
--- a/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ b/metadata/swamid-edugain/keystone-beta.cloud.ipnett.se-shibboleth.xml
diff --git a/swamid-edugain/login.du.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
index 9487a60d..9487a60d 100644
--- a/swamid-edugain/login.du.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.du.se-idp-shibboleth.xml
diff --git a/swamid-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.xml b/metadata/swamid-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.xml
index 204ef30d..204ef30d 100644
--- a/swamid-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.xml
+++ b/metadata/swamid-edugain/login.epsectra.com-oidc-authenticate-ephome_broker.xml
diff --git a/swamid-edugain/login.idp.eduid.se-idp.xml.xml b/metadata/swamid-edugain/login.idp.eduid.se-idp.xml.xml
index e9b261fe..e9b261fe 100644
--- a/swamid-edugain/login.idp.eduid.se-idp.xml.xml
+++ b/metadata/swamid-edugain/login.idp.eduid.se-idp.xml.xml
diff --git a/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
index da0c9edf..da0c9edf 100644
--- a/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
diff --git a/swamid-edugain/login.ki.se-idp-shibboleth.xml b/metadata/swamid-edugain/login.ki.se-idp-shibboleth.xml
index fbfe8647..fbfe8647 100644
--- a/swamid-edugain/login.ki.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/login.ki.se-idp-shibboleth.xml
diff --git a/swamid-edugain/login2.fhs.se-adfs-services-trust.xml b/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
index 147d3d89..147d3d89 100644
--- a/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/login2.fhs.se-adfs-services-trust.xml
diff --git a/swamid-edugain/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-edugain/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml
index ec7080c8..ec7080c8 100644
--- a/swamid-edugain/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-edugain/mfa-check.test.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-edugain/miunidp.miun.se-idp-shibboleth.xml b/metadata/swamid-edugain/miunidp.miun.se-idp-shibboleth.xml
index 3c458dc0..3c458dc0 100644
--- a/swamid-edugain/miunidp.miun.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/miunidp.miun.se-idp-shibboleth.xml
diff --git a/swamid-edugain/mp.uu.se-Shibboleth.sso.xml b/metadata/swamid-edugain/mp.uu.se-Shibboleth.sso.xml
index ba58f45e..ba58f45e 100644
--- a/swamid-edugain/mp.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-edugain/mp.uu.se-Shibboleth.sso.xml
diff --git a/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml b/metadata/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
index 6d099cc5..6d099cc5 100644
--- a/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
+++ b/metadata/swamid-edugain/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml.xml
diff --git a/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml b/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
index 64e81714..64e81714 100644
--- a/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/saml.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-edugain/secure.ouriginal.com.xml b/metadata/swamid-edugain/secure.ouriginal.com.xml
index 6e5c43b2..6e5c43b2 100644
--- a/swamid-edugain/secure.ouriginal.com.xml
+++ b/metadata/swamid-edugain/secure.ouriginal.com.xml
diff --git a/swamid-edugain/secure.urkund.com-shibboleth.xml b/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
index ba9cbd17..ba9cbd17 100644
--- a/swamid-edugain/secure.urkund.com-shibboleth.xml
+++ b/metadata/swamid-edugain/secure.urkund.com-shibboleth.xml
diff --git a/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml b/metadata/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
index 02c186ed..02c186ed 100644
--- a/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
+++ b/metadata/swamid-edugain/signservice.edusign.sunet.se-sigservice.xml
diff --git a/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index 16d12f39..16d12f39 100644
--- a/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml b/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
index 8bb2df7d..8bb2df7d 100644
--- a/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
+++ b/metadata/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml
diff --git a/swamid-edugain/sp.sprakochfolkminnen.se-.xml b/metadata/swamid-edugain/sp.sprakochfolkminnen.se-.xml
index 6ac448c8..6ac448c8 100644
--- a/swamid-edugain/sp.sprakochfolkminnen.se-.xml
+++ b/metadata/swamid-edugain/sp.sprakochfolkminnen.se-.xml
diff --git a/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 30bb9a82..30bb9a82 100644
--- a/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index dcd66cfa..dcd66cfa 100644
--- a/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-edugain/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-edugain/sts.mah.se-adfs-services-trust.xml b/metadata/swamid-edugain/sts.mah.se-adfs-services-trust.xml
index 5f343f48..5f343f48 100644
--- a/swamid-edugain/sts.mah.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/sts.mah.se-adfs-services-trust.xml
diff --git a/swamid-edugain/sts.mau.se-adfs-services-trust.xml b/metadata/swamid-edugain/sts.mau.se-adfs-services-trust.xml
index 298ac702..298ac702 100644
--- a/swamid-edugain/sts.mau.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/sts.mau.se-adfs-services-trust.xml
diff --git a/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml b/metadata/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
index 5896bc3b..5896bc3b 100644
--- a/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/swamid2.shh.se-idp-shibboleth.xml
diff --git a/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml b/metadata/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
index 80fff703..80fff703 100644
--- a/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
diff --git a/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml b/metadata/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
index 60111de6..60111de6 100644
--- a/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/weblogin.smhi.se-idp-shibboleth.xml
diff --git a/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml b/metadata/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml
index 6ac2d1aa..6ac2d1aa 100644
--- a/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml
diff --git a/swamid-edugain/webproxysrv.uniarts.se-adfs-services-trust.xml b/metadata/swamid-edugain/webproxysrv.uniarts.se-adfs-services-trust.xml
index 6fd7aefc..6fd7aefc 100644
--- a/swamid-edugain/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/metadata/swamid-edugain/webproxysrv.uniarts.se-adfs-services-trust.xml
diff --git a/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
index a9ad3dd9..a9ad3dd9 100644
--- a/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.integrationstest.ladok.se-gui-sp.xml
diff --git a/swamid-edugain/www.start.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
index d20af34b..d20af34b 100644
--- a/swamid-edugain/www.start.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.start.ladok.se-gui-sp.xml
diff --git a/swamid-edugain/www.test.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
index f6f488a7..f6f488a7 100644
--- a/swamid-edugain/www.test.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.test.ladok.se-gui-sp.xml
diff --git a/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
index d2017ff9..d2017ff9 100644
--- a/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
+++ b/metadata/swamid-edugain/www.utbildning.ladok.se-gui-sp.xml
diff --git a/swamid-idp-2.0.mxml b/metadata/swamid-idp-2.0.mxml
index 157076c9..157076c9 100644
--- a/swamid-idp-2.0.mxml
+++ b/metadata/swamid-idp-2.0.mxml
diff --git a/swamid-idp-transitive.mxml b/metadata/swamid-idp-transitive.mxml
index fc94f6a0..fc94f6a0 100644
--- a/swamid-idp-transitive.mxml
+++ b/metadata/swamid-idp-transitive.mxml
diff --git a/swamid-idp.mxml b/metadata/swamid-idp.mxml
index ca96b504..ca96b504 100644
--- a/swamid-idp.mxml
+++ b/metadata/swamid-idp.mxml
diff --git a/swamid-interfederations-2.0/.xml b/metadata/swamid-interfederations-2.0/.xml
index d1de9903..d1de9903 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/metadata/swamid-interfederations-2.0/.xml
diff --git a/swamid-interfederations-2.0/metadata.lst b/metadata/swamid-interfederations-2.0/metadata.lst
index 202497cb..202497cb 100644
--- a/swamid-interfederations-2.0/metadata.lst
+++ b/metadata/swamid-interfederations-2.0/metadata.lst
diff --git a/swamid-registered.mxml b/metadata/swamid-registered.mxml
index 94030ae5..94030ae5 100644
--- a/swamid-registered.mxml
+++ b/metadata/swamid-registered.mxml
diff --git a/swamid-sp-2.0.mxml b/metadata/swamid-sp-2.0.mxml
index 9b86e240..9b86e240 100644
--- a/swamid-sp-2.0.mxml
+++ b/metadata/swamid-sp-2.0.mxml
diff --git a/swamid-sp-transitive.mxml b/metadata/swamid-sp-transitive.mxml
index 8cc17273..8cc17273 100644
--- a/swamid-sp-transitive.mxml
+++ b/metadata/swamid-sp-transitive.mxml
diff --git a/swamid-testing-1.0.mxml b/metadata/swamid-testing-1.0.mxml
index 345679a3..345679a3 100644
--- a/swamid-testing-1.0.mxml
+++ b/metadata/swamid-testing-1.0.mxml
diff --git a/swamid-testing-idp-1.0.mxml b/metadata/swamid-testing-idp-1.0.mxml
index 29c45bf8..29c45bf8 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/metadata/swamid-testing-idp-1.0.mxml
diff --git a/swamid-testing-sp-1.0.mxml b/metadata/swamid-testing-sp-1.0.mxml
index b242de9f..b242de9f 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/metadata/swamid-testing-sp-1.0.mxml
diff --git a/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
index 9079e0c0..9079e0c0 100644
--- a/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
diff --git a/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
index d0aea279..d0aea279 100644
--- a/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
diff --git a/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
index bb962e76..bb962e76 100644
--- a/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
diff --git a/swamid-testing/akka-adm.test.uu.se-shibboleth.xml b/metadata/swamid-testing/akka-adm.test.uu.se-shibboleth.xml
index f6250234..f6250234 100644
--- a/swamid-testing/akka-adm.test.uu.se-shibboleth.xml
+++ b/metadata/swamid-testing/akka-adm.test.uu.se-shibboleth.xml
diff --git a/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/metadata/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
index edfac18c..edfac18c 100644
--- a/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/metadata/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
diff --git a/swamid-testing/castest.weblogin.uu.se-cas.xml b/metadata/swamid-testing/castest.weblogin.uu.se-cas.xml
index 0a894c83..0a894c83 100644
--- a/swamid-testing/castest.weblogin.uu.se-cas.xml
+++ b/metadata/swamid-testing/castest.weblogin.uu.se-cas.xml
diff --git a/swamid-testing/coip-test.sunet.se-idp-shibboleth.xml b/metadata/swamid-testing/coip-test.sunet.se-idp-shibboleth.xml
index 4d052c56..4d052c56 100644
--- a/swamid-testing/coip-test.sunet.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/coip-test.sunet.se-idp-shibboleth.xml
diff --git a/swamid-testing/connect.dev.eduid.se-sunet.xml b/metadata/swamid-testing/connect.dev.eduid.se-sunet.xml
index 4368fa01..4368fa01 100644
--- a/swamid-testing/connect.dev.eduid.se-sunet.xml
+++ b/metadata/swamid-testing/connect.dev.eduid.se-sunet.xml
diff --git a/swamid-testing/devrb.lbic.lu.se-.xml b/metadata/swamid-testing/devrb.lbic.lu.se-.xml
index 89e4bd51..89e4bd51 100644
--- a/swamid-testing/devrb.lbic.lu.se-.xml
+++ b/metadata/swamid-testing/devrb.lbic.lu.se-.xml
diff --git a/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml b/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
index ed7c448d..ed7c448d 100644
--- a/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
diff --git a/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml b/metadata/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml
index ecdda021..ecdda021 100644
--- a/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml
diff --git a/swamid-testing/fs.test.bth.se-adfs-services-trust.xml b/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
index 49990bdb..49990bdb 100644
--- a/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
diff --git a/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml b/metadata/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
index 9686ce7f..9686ce7f 100644
--- a/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
diff --git a/swamid-testing/id.test.easyvote.se-Saml2.xml b/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
index e81b4476..e81b4476 100644
--- a/swamid-testing/id.test.easyvote.se-Saml2.xml
+++ b/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
diff --git a/swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml b/metadata/swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml
index 0ee0a4ba..0ee0a4ba 100644
--- a/swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml
+++ b/metadata/swamid-testing/idp-proxy.test.sunet.se-shibboleth.xml
diff --git a/swamid-testing/idp-shibtest.slu.se-idp.xml b/metadata/swamid-testing/idp-shibtest.slu.se-idp.xml
index 125b0dd1..125b0dd1 100644
--- a/swamid-testing/idp-shibtest.slu.se-idp.xml
+++ b/metadata/swamid-testing/idp-shibtest.slu.se-idp.xml
diff --git a/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml b/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
index 01918a8c..01918a8c 100644
--- a/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
diff --git a/swamid-testing/idp-test.suni.se-adfs-services-trust.xml b/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
index ed8e65ce..ed8e65ce 100644
--- a/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
diff --git a/swamid-testing/idp.demo.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
index ce03a45f..ce03a45f 100644
--- a/swamid-testing/idp.demo.antagning.se-aws-idp.xml
+++ b/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
diff --git a/swamid-testing/idp.dev.eduid.se-idp.xml.xml b/metadata/swamid-testing/idp.dev.eduid.se-idp.xml.xml
index d1bb977a..d1bb977a 100644
--- a/swamid-testing/idp.dev.eduid.se-idp.xml.xml
+++ b/metadata/swamid-testing/idp.dev.eduid.se-idp.xml.xml
diff --git a/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
index 2ac504c5..2ac504c5 100644
--- a/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
+++ b/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
diff --git a/swamid-testing/idp.test.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.test.antagning.se-aws-idp.xml
index 69c68b16..69c68b16 100644
--- a/swamid-testing/idp.test.antagning.se-aws-idp.xml
+++ b/metadata/swamid-testing/idp.test.antagning.se-aws-idp.xml
diff --git a/swamid-testing/idp.test.sunet.se-idp.xml b/metadata/swamid-testing/idp.test.sunet.se-idp.xml
index 73b0b2bf..73b0b2bf 100644
--- a/swamid-testing/idp.test.sunet.se-idp.xml
+++ b/metadata/swamid-testing/idp.test.sunet.se-idp.xml
diff --git a/swamid-testing/idp.uhr.se-idp-shibboleth.xml b/metadata/swamid-testing/idp.uhr.se-idp-shibboleth.xml
index 6e7b103f..6e7b103f 100644
--- a/swamid-testing/idp.uhr.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp.uhr.se-idp-shibboleth.xml
diff --git a/swamid-testing/idp02.gih.se-idp-shibboleth.xml b/metadata/swamid-testing/idp02.gih.se-idp-shibboleth.xml
index ffc8927c..ffc8927c 100644
--- a/swamid-testing/idp02.gih.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp02.gih.se-idp-shibboleth.xml
diff --git a/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
index 1a0a0fdc..1a0a0fdc 100644
--- a/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-testing/idpproxy.dev.eduid.se-idp.xml b/metadata/swamid-testing/idpproxy.dev.eduid.se-idp.xml
index 01804226..01804226 100644
--- a/swamid-testing/idpproxy.dev.eduid.se-idp.xml
+++ b/metadata/swamid-testing/idpproxy.dev.eduid.se-idp.xml
diff --git a/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
index 3c23944b..3c23944b 100644
--- a/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
diff --git a/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
index fbb49c94..fbb49c94 100644
--- a/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/metadata/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-testing/konto-test.test.hb.se-Shibboleth.xml b/metadata/swamid-testing/konto-test.test.hb.se-Shibboleth.xml
index b23a9545..b23a9545 100644
--- a/swamid-testing/konto-test.test.hb.se-Shibboleth.xml
+++ b/metadata/swamid-testing/konto-test.test.hb.se-Shibboleth.xml
diff --git a/swamid-testing/konto.test.uu.se-shibboleth.xml b/metadata/swamid-testing/konto.test.uu.se-shibboleth.xml
index 30650938..30650938 100644
--- a/swamid-testing/konto.test.uu.se-shibboleth.xml
+++ b/metadata/swamid-testing/konto.test.uu.se-shibboleth.xml
diff --git a/swamid-testing/login-dev.du.se-idp-shibboleth.xml b/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
index a5895c5e..a5895c5e 100644
--- a/swamid-testing/login-dev.du.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
diff --git a/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
index 702189b6..702189b6 100644
--- a/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
diff --git a/swamid-testing/login.tst.ki.se-idp-shibboleth.xml b/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
index e962e7ea..e962e7ea 100644
--- a/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
diff --git a/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
index 474c715e..474c715e 100644
--- a/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
diff --git a/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml b/metadata/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml
index 0d802fee..0d802fee 100644
--- a/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml
diff --git a/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml b/metadata/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml
index abcb63e1..abcb63e1 100644
--- a/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml
+++ b/metadata/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml
diff --git a/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml b/metadata/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml
index 3ca2568f..3ca2568f 100644
--- a/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml
+++ b/metadata/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml
diff --git a/swamid-testing/openidp.feide.no.xml b/metadata/swamid-testing/openidp.feide.no.xml
index 1f146aff..1f146aff 100644
--- a/swamid-testing/openidp.feide.no.xml
+++ b/metadata/swamid-testing/openidp.feide.no.xml
diff --git a/swamid-testing/permitwinstaging1.caleaccess.com.xml b/metadata/swamid-testing/permitwinstaging1.caleaccess.com.xml
index fd35829d..fd35829d 100644
--- a/swamid-testing/permitwinstaging1.caleaccess.com.xml
+++ b/metadata/swamid-testing/permitwinstaging1.caleaccess.com.xml
diff --git a/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml b/metadata/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml
index 85d816f5..85d816f5 100644
--- a/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml
diff --git a/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml b/metadata/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml
index fe7687b1..fe7687b1 100644
--- a/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml
+++ b/metadata/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml
diff --git a/swamid-testing/samlvettingspdev.test.it.gu.se.xml b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
index 4f92ae6e..4f92ae6e 100644
--- a/swamid-testing/samlvettingspdev.test.it.gu.se.xml
+++ b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
diff --git a/swamid-testing/selfservice-test.test.hb.se-Shibboleth.xml b/metadata/swamid-testing/selfservice-test.test.hb.se-Shibboleth.xml
index 49ae155e..49ae155e 100644
--- a/swamid-testing/selfservice-test.test.hb.se-Shibboleth.xml
+++ b/metadata/swamid-testing/selfservice-test.test.hb.se-Shibboleth.xml
diff --git a/swamid-testing/sesam.test.uu.se-Shibboleth.sso-Metadata.xml b/metadata/swamid-testing/sesam.test.uu.se-Shibboleth.sso-Metadata.xml
index 329c9fa8..329c9fa8 100644
--- a/swamid-testing/sesam.test.uu.se-Shibboleth.sso-Metadata.xml
+++ b/metadata/swamid-testing/sesam.test.uu.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-testing/sesamutvf.its.uu.se-shibboleth.xml b/metadata/swamid-testing/sesamutvf.its.uu.se-shibboleth.xml
index 74b58793..74b58793 100644
--- a/swamid-testing/sesamutvf.its.uu.se-shibboleth.xml
+++ b/metadata/swamid-testing/sesamutvf.its.uu.se-shibboleth.xml
diff --git a/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml b/metadata/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml
index c1b7a96e..c1b7a96e 100644
--- a/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml
diff --git a/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml b/metadata/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml
index 2f72bf89..2f72bf89 100644
--- a/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml
diff --git a/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml b/metadata/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml
index c70d30bd..c70d30bd 100644
--- a/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml
diff --git a/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml b/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
index 3dd65086..3dd65086 100644
--- a/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
diff --git a/swamid-testing/sp-t1.oru.se-shibboleth.xml b/metadata/swamid-testing/sp-t1.oru.se-shibboleth.xml
index d0a53be0..d0a53be0 100644
--- a/swamid-testing/sp-t1.oru.se-shibboleth.xml
+++ b/metadata/swamid-testing/sp-t1.oru.se-shibboleth.xml
diff --git a/swamid-testing/sp.haikom.com-saml-kph-test.xml b/metadata/swamid-testing/sp.haikom.com-saml-kph-test.xml
index 6948c1f0..6948c1f0 100644
--- a/swamid-testing/sp.haikom.com-saml-kph-test.xml
+++ b/metadata/swamid-testing/sp.haikom.com-saml-kph-test.xml
diff --git a/swamid-testing/stslab.mah.se-adfs-services-trust.xml b/metadata/swamid-testing/stslab.mah.se-adfs-services-trust.xml
index be8157fd..be8157fd 100644
--- a/swamid-testing/stslab.mah.se-adfs-services-trust.xml
+++ b/metadata/swamid-testing/stslab.mah.se-adfs-services-trust.xml
diff --git a/swamid-testing/test-his.hr.evry.se-shibboleth.xml b/metadata/swamid-testing/test-his.hr.evry.se-shibboleth.xml
index 3dec0e37..3dec0e37 100644
--- a/swamid-testing/test-his.hr.evry.se-shibboleth.xml
+++ b/metadata/swamid-testing/test-his.hr.evry.se-shibboleth.xml
diff --git a/swamid-testing/test.lu.ortrac.com-saml-sp.xml b/metadata/swamid-testing/test.lu.ortrac.com-saml-sp.xml
index d7713565..d7713565 100644
--- a/swamid-testing/test.lu.ortrac.com-saml-sp.xml
+++ b/metadata/swamid-testing/test.lu.ortrac.com-saml-sp.xml
diff --git a/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml b/metadata/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml
index f2d4999e..f2d4999e 100644
--- a/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml
+++ b/metadata/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml
diff --git a/swamid-testing/test.ortrac.com-saml-sp.xml b/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
index 988a2895..988a2895 100644
--- a/swamid-testing/test.ortrac.com-saml-sp.xml
+++ b/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
diff --git a/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml b/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
index 7cb64c83..7cb64c83 100644
--- a/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
diff --git a/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml b/metadata/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml
index 38c69779..38c69779 100644
--- a/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml
+++ b/metadata/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml
diff --git a/swamid-testing/use-uu.sitevision.se.xml b/metadata/swamid-testing/use-uu.sitevision.se.xml
index 03943eff..03943eff 100644
--- a/swamid-testing/use-uu.sitevision.se.xml
+++ b/metadata/swamid-testing/use-uu.sitevision.se.xml
diff --git a/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml b/metadata/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml
index d0a420ac..d0a420ac 100644
--- a/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml
+++ b/metadata/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml
diff --git a/swamid-testing/vmfront.lan.kth.se-shibboleth.xml b/metadata/swamid-testing/vmfront.lan.kth.se-shibboleth.xml
index e6102b96..e6102b96 100644
--- a/swamid-testing/vmfront.lan.kth.se-shibboleth.xml
+++ b/metadata/swamid-testing/vmfront.lan.kth.se-shibboleth.xml
diff --git a/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml b/metadata/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml
index 17d21035..17d21035 100644
--- a/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/weblogin-test-v4.kau.se-idp-shibboleth.xml
diff --git a/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml b/metadata/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
index 7a0e9d73..7a0e9d73 100644
--- a/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
diff --git a/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml b/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
index 3aa3bb5c..3aa3bb5c 100644
--- a/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
diff --git a/swamid-testing/wl07089.sigma.local-shibboleth.xml b/metadata/swamid-testing/wl07089.sigma.local-shibboleth.xml
index c2e8f743..c2e8f743 100644
--- a/swamid-testing/wl07089.sigma.local-shibboleth.xml
+++ b/metadata/swamid-testing/wl07089.sigma.local-shibboleth.xml
diff --git a/swamid-tou-en.txt b/metadata/swamid-tou-en.txt
index 0e0828db..0e0828db 100644
--- a/swamid-tou-en.txt
+++ b/metadata/swamid-tou-en.txt
diff --git a/swamid-tou-sv.txt b/metadata/swamid-tou-sv.txt
index 63d22e52..63d22e52 100644
--- a/swamid-tou-sv.txt
+++ b/metadata/swamid-tou-sv.txt
diff --git a/swamid2007.mk b/metadata/swamid2007.mk
index 2a054df5..2a054df5 100644
--- a/swamid2007.mk
+++ b/metadata/swamid2007.mk
diff --git a/swamid2016-test.mk b/metadata/swamid2016-test.mk
index ac7ca33a..ac7ca33a 100644
--- a/swamid2016-test.mk
+++ b/metadata/swamid2016-test.mk
diff --git a/swamid2016.mk b/metadata/swamid2016.mk
index 2fdee421..2fdee421 100644
--- a/swamid2016.mk
+++ b/metadata/swamid2016.mk
diff --git a/xslt/add-rpi.xsl b/metadata/xslt/add-rpi.xsl
index 0740b06d..0740b06d 100644
--- a/xslt/add-rpi.xsl
+++ b/metadata/xslt/add-rpi.xsl
diff --git a/xslt/check_framework.xsl b/metadata/xslt/check_framework.xsl
index f4e8d017..f4e8d017 100644
--- a/xslt/check_framework.xsl
+++ b/metadata/xslt/check_framework.xsl
diff --git a/xslt/check_uk_algorithms.xsl b/metadata/xslt/check_uk_algorithms.xsl
index 0a4c024f..0a4c024f 100644
--- a/xslt/check_uk_algorithms.xsl
+++ b/metadata/xslt/check_uk_algorithms.xsl
diff --git a/xslt/clean-entitydescriptor.xsl b/metadata/xslt/clean-entitydescriptor.xsl
index c1c31df9..c1c31df9 100644
--- a/xslt/clean-entitydescriptor.xsl
+++ b/metadata/xslt/clean-entitydescriptor.xsl
diff --git a/xslt/dbg-summary.xslt b/metadata/xslt/dbg-summary.xslt
index 2550ae03..2550ae03 100644
--- a/xslt/dbg-summary.xslt
+++ b/metadata/xslt/dbg-summary.xslt
diff --git a/xslt/entity_id_list.xslt b/metadata/xslt/entity_id_list.xslt
index bda1bb76..bda1bb76 100644
--- a/xslt/entity_id_list.xslt
+++ b/metadata/xslt/entity_id_list.xslt
diff --git a/xslt/extract-idp.xslt b/metadata/xslt/extract-idp.xslt
index 4858876f..4858876f 100644
--- a/xslt/extract-idp.xslt
+++ b/metadata/xslt/extract-idp.xslt
diff --git a/xslt/extract-non-idp.xslt b/metadata/xslt/extract-non-idp.xslt
index b12c587c..b12c587c 100644
--- a/xslt/extract-non-idp.xslt
+++ b/metadata/xslt/extract-non-idp.xslt
diff --git a/xslt/extract-sp.xslt b/metadata/xslt/extract-sp.xslt
index 058504e3..058504e3 100644
--- a/xslt/extract-sp.xslt
+++ b/metadata/xslt/extract-sp.xslt
diff --git a/xslt/filter-idp.xslt b/metadata/xslt/filter-idp.xslt
index 868bc1a2..868bc1a2 100644
--- a/xslt/filter-idp.xslt
+++ b/metadata/xslt/filter-idp.xslt
diff --git a/xslt/full-summary.xslt b/metadata/xslt/full-summary.xslt
index bf127dfa..bf127dfa 100644
--- a/xslt/full-summary.xslt
+++ b/metadata/xslt/full-summary.xslt
diff --git a/xslt/idp-list.xslt b/metadata/xslt/idp-list.xslt
index 0d18be8a..0d18be8a 100644
--- a/xslt/idp-list.xslt
+++ b/metadata/xslt/idp-list.xslt
diff --git a/xslt/idp-summary.xslt b/metadata/xslt/idp-summary.xslt
index cc5a5f16..cc5a5f16 100644
--- a/xslt/idp-summary.xslt
+++ b/metadata/xslt/idp-summary.xslt
diff --git a/xslt/import-metadata.xsl b/metadata/xslt/import-metadata.xsl
index 2edf7ed2..2edf7ed2 100644
--- a/xslt/import-metadata.xsl
+++ b/metadata/xslt/import-metadata.xsl
diff --git a/xslt/list-locations.xslt b/metadata/xslt/list-locations.xslt
index fd22fac3..fd22fac3 100644
--- a/xslt/list-locations.xslt
+++ b/metadata/xslt/list-locations.xslt
diff --git a/xslt/normalize.xsl b/metadata/xslt/normalize.xsl
index f3c086ac..f3c086ac 100644
--- a/xslt/normalize.xsl
+++ b/metadata/xslt/normalize.xsl
diff --git a/xslt/sign-luna-sha256-excl.xsl b/metadata/xslt/sign-luna-sha256-excl.xsl
index 08e48270..08e48270 100644
--- a/xslt/sign-luna-sha256-excl.xsl
+++ b/metadata/xslt/sign-luna-sha256-excl.xsl
diff --git a/xslt/sign-luna-sha256.xsl b/metadata/xslt/sign-luna-sha256.xsl
index 293bb96d..293bb96d 100644
--- a/xslt/sign-luna-sha256.xsl
+++ b/metadata/xslt/sign-luna-sha256.xsl
diff --git a/xslt/sign-luna.xsl b/metadata/xslt/sign-luna.xsl
index 48364512..48364512 100644
--- a/xslt/sign-luna.xsl
+++ b/metadata/xslt/sign-luna.xsl
diff --git a/xslt/sign.xsl b/metadata/xslt/sign.xsl
index 51d2492a..51d2492a 100644
--- a/xslt/sign.xsl
+++ b/metadata/xslt/sign.xsl
diff --git a/xslt/sp-summary.xslt b/metadata/xslt/sp-summary.xslt
index e630c954..e630c954 100644
--- a/xslt/sp-summary.xslt
+++ b/metadata/xslt/sp-summary.xslt
diff --git a/xslt/summary.xslt b/metadata/xslt/summary.xslt
index 05152d13..05152d13 100644
--- a/xslt/summary.xslt
+++ b/metadata/xslt/summary.xslt
diff --git a/scripts/bump-tag b/scripts/bump-tag
new file mode 100755
index 00000000..7cb85076
--- /dev/null
+++ b/scripts/bump-tag
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+git pull
+
+tagpfx=${tag:="md"}
+
+last_tag=`git tag -l "${tagpfx}-*"|sort|tail -1`
+
+echo "Verifying last tag $last_tag:"
+(git tag -v $last_tag | grep ^gpg:) || true
+# again to not mask exit status of git with grep
+git tag -v $last_tag > /dev/null 2>&1
+echo ""
+
+echo "Differences between tag $last_tag and what you are about to sign:"
+PAGER=cat git diff $last_tag..master
+
+iter=1
+ok=
+while test -z "$ok"; do
+    this_tag=$(date +${tagpfx}-%Y-%m-%d-v`printf "%02d" $iter`)
+    iter=`expr $iter + 1`
+    case `(echo $this_tag; echo $last_tag) | sort | tail -1` in
+	$last_tag)
+	    ;;
+	$this_tag)
+	    ok=yes
+	    ;;
+    esac
+done
+
+echo ""
+echo "Using new tag $this_tag"
+echo ONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE
+
+# GITTAGEXTRA is for putting things like "-u 2117364A"
+
+git tag $GITTAGEXTRA -m bump. -s $this_tag
+
+git push
+git push --tags
diff --git a/scripts/do-update.sh b/scripts/do-update.sh
new file mode 100755
index 00000000..5dc38700
--- /dev/null
+++ b/scripts/do-update.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd /var/cache/metadata_git.swamid.se && make update
+rsync -a /opt/metadata/swamid-internal/* /opt/metadata/swamid-qa
+
+./scripts/download-pending
+cd /var/cache/metadata_git.swamid.se/metadata || exit 2
+for file in `ls swamid-internal/` ; do
+        if [ -r swamid-qa/$file ]; then
+		diff swamid-internal/$file swamid-qa/$file || exit 1
+	fi
+done
+#/opt/metadata/scripts/update-and-validate.sh
diff --git a/scripts/update-trust b/scripts/update-trust
new file mode 100755
index 00000000..bffeaa1b
--- /dev/null
+++ b/scripts/update-trust
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+export GNUPGHOME=/etc/metadata/gnupg
+mkdir -p $GNUPGHOME
+chmod 0700 $GNUPGHOME
+export GPG=gpg
+
+# Install new keys discovered in the keys directory
+for k in keys/*.pub; do
+   fp=`$GPG --with-colons --with-fingerprint --show-key < $k | awk -F: '$1 == "pub" {print $5}'`
+   fp_in_db=`$GPG --with-colons --fingerprint | grep ":$fp:"`
+   if [ "x`echo $fp_in_db | grep '^pub:e:'`" != "x" ]; then
+       echo "$0: Key expired, will re-import it from $k"
+       $GPG --fingerprint $fp
+   fi
+   # The removal of any ^pub:e: entrys means to ignore expired keys - thereby importing them again.
+   echo $fp_in_db | grep -v "^pub:e:" | grep -q ":$fp:" || $GPG --import < $k
+done
+
+# Delete keys no longer present in keys directory
+for fp in `$GPG --with-colons --fingerprint | awk -F: '$1 == "pub" {print $5}'`; do
+   seen="no"
+   for k in keys/*.pub; do
+      $GPG --with-colons --with-fingerprint --show-key < $k | grep -q ":$fp:" && seen="yes"
+   done
+   if [ "x$seen" = "xno" ]; then
+      $GPG --yes --batch --delete-key $fp || true
+   fi
+done
diff --git a/scripts/verify-tag b/scripts/verify-tag
new file mode 100755
index 00000000..ddc3ff3b
--- /dev/null
+++ b/scripts/verify-tag
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+export GNUPGHOME=/etc/metadata/gnupg
+mkdir -p $GNUPGHOME
+export GPG=gpg
+
+git config --global gpg.program gpg
+
+tag=$(git tag -l "md-[0-9]*" | sort | tail -1)
+if [ -z "$tag" ]; then
+   echo "no matching tag found"
+   exit 1
+fi
+git checkout $tag && git tag -v $tag