diff --git a/README-SPS-METADATA.md b/README-SPS-METADATA.md
index 1439627257777b5b2d1cde60c4711edfc4c09760..2f4d9aeb24e11ccaee19fff875b9bf5936ecfe20 100644
--- a/README-SPS-METADATA.md
+++ b/README-SPS-METADATA.md
@@ -10,7 +10,7 @@
 
 The eduGAIN Connectivity Check Service (ECCS), uses two Service Provider belonging to different NREN that are members of eduGAIN interfederation.
 The ECCS Python script gets the SPs' HTTP-Post AssertionConsumerService URL from the "sps-metadata.xml" file placed into "input" directory.
-The mechanism chosen to update regularly the "sps-metadata.xml" file involves the PyFF Metadata Aggregator because it allows to download the eduGAIN metadata, validate it with eduGAIN metadata certificate, consider only two SP interested by ECCS and create the "sps-metadata.xml" file as output.
+The mechanism chosen to update regularly the "sps-metadata.xml" file involves the PyFF Metadata Aggregator because it allows to download the NREN SPs metadata, validate it with the metadata certificate provided  and create the "sps-metadata.xml" file as output.
 The following instruction will help to install, configure and use PyFF for ECCS.
 
 ## Requirements
@@ -41,7 +41,7 @@ The following instruction will help to install, configure and use PyFF for ECCS.
      
 2) Download eduGAIN metadata certificate:
    * `cd $HOME/eccs/pyff-config`
-   * `wget "https://technical.edugain.org/mds-v2.cer" -O edugain-signer.crt`
+   * `wget https://mdx.idem.garr.it/idem-mdx-service-crt.pem`
 
 ## Automating SPs metadata download
 
diff --git a/pyff-config/sps-metadata.xml b/pyff-config/sps-metadata.xml
index 55ee67534f0773268b4f2feb5b973e3683b26b71..c8a40d05a2f7e334e60a0e263fea7888fe72e575 100644
--- a/pyff-config/sps-metadata.xml
+++ b/pyff-config/sps-metadata.xml
@@ -1,6 +1,5 @@
 - load:
-   - https://mds.edugain.org/edugain-v2.xml /srv/eccs/pyff-config/edugain-signer.crt
+   - https://mdx.idem.garr.it/edugain/entities/https:%2F%2Fattribute-viewer.aai.switch.ch%2Finterfederation-test%2Fshibboleth /srv/eccs/pyff-config/idem-mdx-service-crt.pem
+   - https://mdx.idem.garr.it/edugain/entities/https:%2F%2Fsp-demo.idem.garr.it%2Fshibboleth /srv/eccs/pyff-config/idem-mdx-service-crt.pem
 - select:
-   - "https://sp-demo.idem.garr.it/shibboleth"
-   - "https://attribute-viewer.aai.switch.ch/interfederation-test/shibboleth"
 - publish: "/srv/eccs/input/sps-metadata.xml"