diff --git a/1.3.0/annexes/annex-08-eudi-wallet-design-guide.pdf b/1.3.0/annexes/annex-08-design-guide.pdf
similarity index 100%
rename from 1.3.0/annexes/annex-08-eudi-wallet-design-guide.pdf
rename to 1.3.0/annexes/annex-08-design-guide.pdf
diff --git a/1.3.0/annexes/annex-09-eudi-wallet-design-guide-data-sharing-scenarios.pdf b/1.3.0/annexes/annex-09-design-guide-data-sharing-scenarios.pdf
similarity index 100%
rename from 1.3.0/annexes/annex-09-eudi-wallet-design-guide-data-sharing-scenarios.pdf
rename to 1.3.0/annexes/annex-09-design-guide-data-sharing-scenarios.pdf
diff --git a/1.3.0/arf/index.html b/1.3.0/arf/index.html
index 41e7ba7..1c5014d 100644
--- a/1.3.0/arf/index.html
+++ b/1.3.0/arf/index.html
@@ -5734,44 +5734,48 @@ <h3 id="a1-annex-01-initialisation-and-activation">A.1 Annex 01 - initialisation
 <p>The service blueprint about initialisation and activation of the Wallet
 is described in the attached file:</p>
 <ul>
-<li><a href="../annexes/annex-01-initialisation-and-activation.pdf">Annex 01 - EUDI Wallet – Initialisation and Activation.pdf</a></li>
+<li><a href="../annexes/annex-01-initialisation-and-activation.pdf">Annex 01 - EUDI Wallet – Initialisation and Activation <code>PDF</code></a></li>
 </ul>
 <h3 id="a2-annex-02-online-identification-and-authentication">A.2 Annex 02 – online identification and authentication</h3>
 <p>The service blueprint about online identification and authentication for
 the Wallet is described in the attached file:</p>
 <ul>
-<li><a href="../annexes/annex-02-online-identification-and-authentication.pdf">Annex 02- EUDI Wallet – Online Identification and Authentication.pdf</a></li>
+<li><a href="../annexes/annex-02-online-identification-and-authentication.pdf">Annex 02- EUDI Wallet – Online Identification and Authentication <code>PDF</code></a></li>
 </ul>
 <h3 id="a3-annex-03-issuing-mdl">A.3 Annex 03 – issuing mDL</h3>
 <p>The service blueprint about issuing mDL is described in the attached
 file:</p>
 <ul>
-<li><a href="../annexes/annex-03-issuing-mdl.pdf">Annex 03 – EUDI Wallet – issuing mDL.pdf</a></li>
+<li><a href="../annexes/annex-03-issuing-mdl.pdf">Annex 03 – EUDI Wallet – issuing mDL <code>PDF</code></a></li>
 </ul>
 <h3 id="a4-annex-04-presenting-mdl-proximity-supervised">A.4 Annex 04 – presenting mDL (proximity-supervised)</h3>
 <p>The service blueprint about presenting mDL (proximity-supervised) is
 described in the attached file:</p>
 <ul>
-<li><a href="../annexes/annex-04-presenting-mdl-proximity-supervised.pdf">Annex 04 – EUDI Wallet – presenting mDL (proximity-supervised).pdf</a>.</li>
+<li><a href="../annexes/annex-04-presenting-mdl-proximity-supervised.pdf">Annex 04 – EUDI Wallet – presenting mDL (proximity-supervised) <code>PDF</code></a>.</li>
 </ul>
 <h3 id="a5-annex-05-presenting-mdl-proximity-unsupervised">A.5 Annex 05 – presenting mDL (proximity-unsupervised)</h3>
 <p>The service blueprint about presenting mDL (proximity-unsupervised) is
 described in the attached file:
-* <a href="../annexes/annex-05-presenting-mdl-proximity-unsupervised.pdf">Annex 05 – EUDI Wallet – presenting mDL (proximity-unsupervised).pdf</a></p>
+* <a href="../annexes/annex-05-presenting-mdl-proximity-unsupervised.pdf">Annex 05 – EUDI Wallet – presenting mDL (proximity-unsupervised) <code>PDF</code></a></p>
 <h2 id="a6-annex-06-pid-rulebook">A.6 Annex 06 – PID rulebook</h2>
 <p>The PID attribute schema, indicative EUDI Wallet Instance Attestation
 and Trust Infrastructure details are further detailed in the attached
-file:
-* <a href="../annexes/annex-06-pid-rulebook.pdf">Annex 06 – EUDI Wallet – PID rulebook.pdf</a></p>
+file(s):
+* <a href="../annexes/annex-06-pid-rulebook/">Annex 06 – EUDI Wallet – PID rulebook </a>
+* <a href="../annexes/annex-06-pid-rulebook.pdf">Annex 06 – EUDI Wallet – PID rulebook <code>PDF</code></a></p>
 <h2 id="a7-annex-07-mdl-rulebook">A.7 Annex 07 - mDL rulebook</h2>
-<p>The mDL attribute schema is further detailed in the attached file:
-* <a href="../annexes/annex-07-mdl-rulebook.pdf">Annex 07 – EUDI Wallet – mDL rulebook.pdf</a></p>
+<p>The mDL attribute schema is further detailed in the attached file(s):
+* <a href="../annexes/annex-07-mdl-rulebook/">Annex 07 – EUDI Wallet – mDL rulebook</a>
+* <a href="../annexes/annex-07-mdl-rulebook.pdf">Annex 07 – EUDI Wallet – mDL rulebook <code>PDF</code></a></p>
 <h2 id="a8-annex-08-design-guide">A.8 Annex 08 - Design Guide</h2>
 <p>A first iteration of an EUDI Wallet Design Guide can be found in the attached file:
-* <a href="../annexes/annex-08-eudi-wallet-design-guide.pdf">Annex 08 – EUDI Wallet Design Guide.pdf</a></p>
+* <a href="../annexes/annex-08-design-guide/">Annex 08 – EUDI Wallet Design Guide</a>
+* <a href="./annexes/annex-08-eudi-wallet-design-guide.pdf">Annex 08 – EUDI Wallet Design Guide <code>PDF</code></a></p>
 <h2 id="a9-annex-09-design-guide-data-sharing-scenarios">A.9  Annex 09 - Design guide data sharing scenarios</h2>
 <ul>
-<li><a href="../annexes/annex-09-eudi-wallet-design-guide-data-sharing-scenarios.pdf">Annex 09 – EUDI Wallet Design Guide Data Sharing Scenarios.pdf</a></li>
+<li><a href="../annexes/annex-09-design-guide-data-sharing-scenarios/">Annex 09 – EUDI Wallet Design Guide Data Sharing Scenarios</a></li>
+<li><a href="../annexes/annex-09-design-guide-data-sharing-scenarios.pdf">Annex 09 – EUDI Wallet Design Guide Data Sharing Scenarios <code>PDF</code></a></li>
 </ul>
 <div class="footnote">
 <hr />
diff --git a/1.3.0/sitemap.xml.gz b/1.3.0/sitemap.xml.gz
index 5b259ff..8ecffe0 100644
Binary files a/1.3.0/sitemap.xml.gz and b/1.3.0/sitemap.xml.gz differ