diff --git a/docs/building/run_tfm_examples_on_arm_platforms.rst b/docs/building/run_tfm_examples_on_arm_platforms.rst
index 6aab523..d1ec478 100644
--- a/docs/building/run_tfm_examples_on_arm_platforms.rst
+++ b/docs/building/run_tfm_examples_on_arm_platforms.rst
@@ -556,10 +556,10 @@
 --------------
 
 .. _Arm Development Studio: https://developer.arm.com/tools-and-software/embedded/arm-development-studio
-.. _Arm Development Studio Documentation: https://developer.arm.com/tools-and-software/embedded/arm-development-studio/learn/docs
-.. _Fixed Virtual Platforms: https://developer.arm.com/tools-and-software/simulation-models/fixed-virtual-platforms
+.. _Arm Development Studio Documentation: https://developer.arm.com/documentation/101469/2024-1/?lang=en
+.. _Fixed Virtual Platforms: https://developer.arm.com/documentation/100966/1128/MPS2-Platform-FVPs/FVP-MPS2-AEMv8M?lang=en
 .. _Fixed Virtual Platforms Documentation: https://developer.arm.com/documentation/100966/latest
 .. _Keil MDK: http://www2.keil.com/mdk5
-.. _Keil MDK Documentation: https://www2.keil.com/mdk5/docs
+.. _Keil MDK Documentation: https://developer.arm.com/documentation/KGS1/latest
 
 *Copyright (c) 2017-2024, Arm Limited. All rights reserved.*
diff --git a/docs/building/tests_build_instruction.rst b/docs/building/tests_build_instruction.rst
index e1d43ab..2ebdea8 100644
--- a/docs/building/tests_build_instruction.rst
+++ b/docs/building/tests_build_instruction.rst
@@ -98,7 +98,7 @@
 Reference
 *********
 
-.. [1] `tf-m-tests <https://git.trustedfirmware.org/TF-M/tf-m-tests.git/about/>`__
+.. [1] `tf-m-tests <https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-tests/>`__
 
 .. [2] `PSA Certified APIs Architecture Test Suite <https://github.com/ARM-software/psa-arch-tests/blob/v23.06_API1.5_ADAC_EAC/api-tests/dev_apis/README.md>`__
 
diff --git a/docs/building/tfm_build_instruction.rst b/docs/building/tfm_build_instruction.rst
index 06a34d7..e9abffd 100644
--- a/docs/building/tfm_build_instruction.rst
+++ b/docs/building/tfm_build_instruction.rst
@@ -239,7 +239,7 @@
 +----------------+---------------------+-----------------------------------------------------+
 | Dependency     | Cmake variable      | Git repo URL                                        |
 +================+=====================+=====================================================+
-| Mbed Crypto    | MBEDCRYPTO_PATH     | https://github.com/ARMmbed/mbedtls                  |
+| Mbed Crypto    | MBEDCRYPTO_PATH     | https://github.com/Mbed-TLS/mbedtls                 |
 +----------------+---------------------+-----------------------------------------------------+
 | MCUboot        | MCUBOOT_PATH        | https://github.com/mcu-tools/mcuboot                |
 +----------------+---------------------+-----------------------------------------------------+
diff --git a/docs/contributing/code_review_guide.rst b/docs/contributing/code_review_guide.rst
index 5b260c2..43088e5 100644
--- a/docs/contributing/code_review_guide.rst
+++ b/docs/contributing/code_review_guide.rst
@@ -5,7 +5,8 @@
 the code review process.
 
 Please contact :doc:`maintainers </contributing/maintainers>` or write an e-mail
-thread on the `TF-M mailing list <mailto:tf-m@lists.trustedfirmware.org>`_ for
+thread on the TF-M mailing list
+`tf-m@lists.trustedfirmware.org <mailto:tf-m@lists.trustedfirmware.org>`_ for
 any questions.
 
 **********************
diff --git a/docs/contributing/contributing_process.rst b/docs/contributing/contributing_process.rst
index 25fb7dd..c17c22e 100644
--- a/docs/contributing/contributing_process.rst
+++ b/docs/contributing/contributing_process.rst
@@ -5,11 +5,12 @@
 
 .. Note::
 
-   Please contact `TF-M mailing list <mailing_list_>`_ for any question.
+   Please contact TF-M mailing list
+   `tf-m@lists.trustedfirmware.org <mailing_list_>`_ for any question.
 
-- It is recommended to subscribe to `TF-M mailing list <mailing_list_>`_
+- It is recommended to subscribe to TF-M mailing list
   via `this page <https://lists.trustedfirmware.org/mailman3/lists/tf-m.lists.trustedfirmware.org>`_.
-- Refer to the :doc:`/roadmap` or send a mail to the `TF-M mailing list <mailing_list_>`_
+- Refer to the :doc:`/roadmap` or send a mail to the TF-M mailing list `tf-m@lists.trustedfirmware.org <mailing_list_>`_
   to get the latest status and plan of TF-M.
 - Follow :doc:`Design Proposal Guideline </contributing/tfm_design_proposal_guideline>`
   to propose your design.
@@ -18,7 +19,7 @@
   - Clone the TF-M code on your own machine from `TF-M git repository
     <https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git>`_.
   - Follow the :doc:`TF-M getting started </getting_started/tfm_getting_started>`,
-    :doc:`Build Instructions </building/tfm_build_instruction>`
+    :doc:`Build Instructions </building/tfm_build_instruction>` and
     :doc:`Coding Guide </contributing/coding_guide>` for the TF-M project.
   - Make your changes in logical chunks to help reviewers. Each commit should
     be a separate review and either work properly or be squashed after the
@@ -68,7 +69,7 @@
   the patch.
 - You may be asked to provide further details or make additional changes.
 - You can discuss further with code owner(s) and maintainer(s) directly via
-  `TF-M mailing list <mailing_list_>`_ if necessary.
+  TF-M mailing list `tf-m@lists.trustedfirmware.org <mailing_list_>`_ if necessary.
 - If multiple patches are linked in a chain then code owners and maintainers
   should review and merge individual patches when they are ready, rather than
   waiting for the entire chain to be reviewed. If multiple patches are intended
diff --git a/docs/contributing/doc_guidelines.rst b/docs/contributing/doc_guidelines.rst
index 82af63d..583ea7c 100644
--- a/docs/contributing/doc_guidelines.rst
+++ b/docs/contributing/doc_guidelines.rst
@@ -62,8 +62,8 @@
 allowing maintainers to bundle platform specific documentation. Platforms are
 grouped by vendor. **This behaviour needs to be explicitly enabled for each
 vendor's space** by providing the `<vendor>/index.rst` (responsible for generating the
-:doc:`Platform Index File </platform/index>`) and adding a table of
-contents entry for the corresponding vendor's space.
+Platform Index File, as seen linked in :doc:`TF-M Platforms </platform/index>`)
+contents entry for the corresponding vendor's space in :doc:`TF-M Platforms </platform/index>`.
 The format and structure of this entry is not strictly defined, and allows
 flexible control of vendor's and platform's documentation space.
 Follow the :ref:`platform_documentation` document for more details.
@@ -301,7 +301,7 @@
 .. _Python Documentation Guidelines: https://devguide.python.org/documentation/style-guide/
 .. _Pygments Lexers: https://pygments.org/docs/api/#lexers
 .. _Intersphinx: https://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html
-.. _conf.py: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/docs/conf.py
+.. _conf.py: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m.git/+/HEAD/docs/conf.py
 
 --------------
 
diff --git a/docs/contributing/standards/misra.rst b/docs/contributing/standards/misra.rst
index f605f12..853d5bb 100644
--- a/docs/contributing/standards/misra.rst
+++ b/docs/contributing/standards/misra.rst
@@ -24,7 +24,7 @@
 suggestions and contributions to better align with the MISRA-C standard.
 
 .. Note::
-   In this document, `Caution` refers to a `caution report`_ generated by Eclair MISRA-C static
+   In this document, `Caution` refers to a `caution report` generated by Eclair MISRA-C static
    analyser.
 
 ***************
@@ -109,7 +109,6 @@
 index.html -> Report by issue strictness (Mandatory/Required/Advisory) (violations)
 
 .. _TF-M Eclair daily CI pipeline: https://ci.trustedfirmware.org/view/TF-M/job/tf-m-eclair-daily/
-.. _caution report: https://eclairit.com:3787/doc/index.html#term-caution-report
 
 --------------
 
diff --git a/docs/design_docs/booting/secure_boot_hw_key_integration.rst b/docs/design_docs/booting/secure_boot_hw_key_integration.rst
index c0d5ec0..21d382a 100644
--- a/docs/design_docs/booting/secure_boot_hw_key_integration.rst
+++ b/docs/design_docs/booting/secure_boot_hw_key_integration.rst
@@ -8,7 +8,7 @@
 Abstract
 --------
 
-`PSA Trusted Boot and Firmware Update <https://pages.arm.com/psa-resources-tbfu.html>`__
+`PSA Trusted Boot and Firmware Update <https://developer.arm.com/-/media/Arm%20Developer%20Community/PDF/PSA/DEN0072-PSA_TBFU_1.1-BETA0.pdf?revision=3ce2513a-ae0f-4b43-96a0-851ed67a640b>`__
 specification requires the support of at least one immutable root of trust
 public key (ROTPK) for firmware verification. This can be stored using a locked
 on-chip flash memory, a secure-element or on-chip OTP memory. It also beneficial
diff --git a/docs/design_docs/booting/tfm_secure_boot.rst b/docs/design_docs/booting/tfm_secure_boot.rst
index 3a3f271..cf441c5 100644
--- a/docs/design_docs/booting/tfm_secure_boot.rst
+++ b/docs/design_docs/booting/tfm_secure_boot.rst
@@ -42,7 +42,7 @@
 CMake variable. If you wish to use a locally downloaded copy, the CMake variable
 ``MCUBOOT_PATH`` can be set to its location. This document contains information
 about how MCUboot has been integrated to TF-M. For further information about
-MCUboot design please refer to the `MCUBoot homepage <https://www.mcuboot.com/>`__.
+MCUboot design please refer to the `MCUBoot homepage <https://www.trustedfirmware.org/projects/mcuboot/index.html>`__.
 
 Bootloader is started when CPU is released from reset. It runs in secure mode.
 It authenticates the firmware image by hash (SHA-256) and digital signature
diff --git a/docs/design_docs/ff_isolation.rst b/docs/design_docs/ff_isolation.rst
index f078dc2..288d963 100644
--- a/docs/design_docs/ff_isolation.rst
+++ b/docs/design_docs/ff_isolation.rst
@@ -436,7 +436,7 @@
 
 .. [1] `Arm PSA Firmware Framework for M 1.0 (FF-M 1.0) <https://developer.arm.com/documentation/den0063/latest/>`_
 .. [2] `Arm Firmware Framework for M 1.1 Extension (FF-M 1.1) <https://developer.arm.com/documentation/aes0039/latest/>`_
-.. [3] `Arm Trusted Base System Architecture for M (TBSA-M) <https://www.arm.com/en/architecture/security-features/platform-security>`_
+.. [3] `Arm Trusted Base System Architecture for M (TBSA-M) <https://developer.arm.com/-/media/Arm%20Developer%20Community/PDF/PSA/DEN0083_PSA_TBSA-M_1.0-bet2.pdf?revision=5f9de99f-a7b5-4851-b041-f698521bf6bf>`_
 
 --------------
 
diff --git a/docs/design_docs/services/ps_key_management.rst b/docs/design_docs/services/ps_key_management.rst
index 6ce540f..5345722 100644
--- a/docs/design_docs/services/ps_key_management.rst
+++ b/docs/design_docs/services/ps_key_management.rst
@@ -4,7 +4,6 @@
 
 :Author: Jamie Fox
 :Organization: Arm Limited
-:Contact: Jamie Fox <jamie.fox@arm.com>
 
 Background
 ==========
@@ -115,13 +114,11 @@
 
 References
 ==========
-.. [TBSA-M] Arm Platform Security Architecture Trusted Base System Architecture
-   for Armv6-M, Armv7-M and Armv8-M, version 1.0
-.. [HKDF] Hugo Krawczyk. 2010. Cryptographic extraction and key derivation: the
-   HKDF scheme. In Proceedings of the 30th annual conference on Advances in
-   cryptology (CRYPTO'10)
-.. [RFC5869] IETF RFC 5869: HMAC-based Extract-and-Expand Key Derivation
-   Function (HKDF)
+.. [TBSA-M] `Arm Platform Security Architecture Trusted Base System Architecture for Armv6-M, Armv7-M and Armv8-M, version 1.0  <https://developer.arm.com/-/media/Arm%20Developer%20Community/PDF/PSA/DEN0083_PSA_TBSA-M_1.0-bet2.pdf?revision=5f9de99f-a7b5-4851-b041-f698521bf6bf>`_
+
+.. [HKDF] `Hugo Krawczyk. 2010. Cryptographic extraction and key derivation: the HKDF scheme. In Proceedings of the 30th annual conference on Advances in cryptology (CRYPTO'10) <https://eprint.iacr.org/2010/264.pdf>`_
+
+.. [RFC5869] `IETF RFC 5869: HMAC-based Extract-and-Expand Key Derivation Function (HKDF) <https://datatracker.ietf.org/doc/html/rfc5869>`_
 
 --------------
 
diff --git a/docs/design_docs/services/stateless_rot_service.rst b/docs/design_docs/services/stateless_rot_service.rst
index 4e3f47e..f137ee3 100644
--- a/docs/design_docs/services/stateless_rot_service.rst
+++ b/docs/design_docs/services/stateless_rot_service.rst
@@ -4,7 +4,6 @@
 
 :Author: Mingyang Sun
 :Organization: Arm Limited
-:Contact: mingyang.sun@arm.com
 
 
 ************
diff --git a/docs/design_docs/services/symmetric_initial_attest.rst b/docs/design_docs/services/symmetric_initial_attest.rst
index ca6d2b6..23586b9 100644
--- a/docs/design_docs/services/symmetric_initial_attest.rst
+++ b/docs/design_docs/services/symmetric_initial_attest.rst
@@ -325,7 +325,7 @@
 
 .. [3] :doc:`Initial Attestation Service Integration Guide </integration_guide/services/tfm_attestation_integration_guide>`
 
-.. [4] `t_cose library <https://github.com/laurencelundblade/t_cose/blob/v2.0-alpha-2/inc/t_cose/t_cose_mac_compute.h>`_
+.. [4] `MAC compute in t_cose library <https://github.com/laurencelundblade/t_cose/blob/v2.0-alpha-2/inc/t_cose/t_cose_mac_compute.h>`_
 
 .. [5] `HMAC: Keyed-Hashing for Message Authentication <https://tools.ietf.org/html/rfc2104>`_
 
diff --git a/docs/design_docs/services/tfm_crypto_design.rst b/docs/design_docs/services/tfm_crypto_design.rst
index 5279332..ab9dec5 100644
--- a/docs/design_docs/services/tfm_crypto_design.rst
+++ b/docs/design_docs/services/tfm_crypto_design.rst
@@ -355,7 +355,7 @@
 .. [1] PSA Certified Crypto API specifications: \ https://arm-software.github.io/psa-api/crypto/
 .. [2] Using PSA - Getting started in Mbed TLS: \ https://mbed-tls.readthedocs.io/en/latest/getting_started/psa/
 .. [3] ``Mbed TLS`` repository which holds the reference implementation as a `C` software library: \ https://github.com/Mbed-TLS
-.. [4] PSA Unified Driver Interface for Cryptoprocessors: \ https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/psa-driver-interface.md
+.. [4] PSA Unified Driver Interface for Cryptoprocessors: \ https://github.com/Mbed-TLS/TF-PSA-Crypto/blob/development/docs/proposed/psa-driver-interface.md
 .. [5] TF-M Builtin Key Loader driver, normally described as :ref:`tfm_builtin_key_loader <tfm-builtin-keys-label>`
 
 --------------
diff --git a/docs/design_docs/services/tfm_fwu_service.rst b/docs/design_docs/services/tfm_fwu_service.rst
index ade3541..ca543dc 100644
--- a/docs/design_docs/services/tfm_fwu_service.rst
+++ b/docs/design_docs/services/tfm_fwu_service.rst
@@ -4,7 +4,6 @@
 
 :Author: Sherry Zhang
 :Organization: Arm Limited
-:Contact: Sherry Zhang <Sherry.Zhang2@arm.com>
 
 .. contents:: Table of Contents
    :depth: 3
diff --git a/docs/design_docs/services/tfm_its_service.rst b/docs/design_docs/services/tfm_its_service.rst
index efa9a21..3fe53f9 100644
--- a/docs/design_docs/services/tfm_its_service.rst
+++ b/docs/design_docs/services/tfm_its_service.rst
@@ -4,7 +4,6 @@
 
 :Author: Jamie Fox
 :Organization: Arm Limited
-:Contact: Jamie Fox <jamie.fox@arm.com>
 
 .. toctree::
     :maxdepth: 1
diff --git a/docs/design_docs/services/tfm_psa_inter_process_communication.rst b/docs/design_docs/services/tfm_psa_inter_process_communication.rst
index 8393a17..26e5528 100644
--- a/docs/design_docs/services/tfm_psa_inter_process_communication.rst
+++ b/docs/design_docs/services/tfm_psa_inter_process_communication.rst
@@ -4,7 +4,6 @@
 
 :Authors: Ken Liu, Mingyang Sun
 :Organization: Arm Limited
-:Contact: ken.liu@arm.com, mingyang.sun@arm.com
 
 ***********
 Terminology
diff --git a/docs/design_docs/software/enum_implicit_casting.rst b/docs/design_docs/software/enum_implicit_casting.rst
index 3c1e453..a928b8a 100644
--- a/docs/design_docs/software/enum_implicit_casting.rst
+++ b/docs/design_docs/software/enum_implicit_casting.rst
@@ -4,7 +4,6 @@
 
 :Author: Hugues de Valon
 :Organization: Arm Limited
-:Contact: hugues.devalon@arm.com
 
 ********
 Abstract
diff --git a/docs/design_docs/software/tfm_code_generation_with_jinja2.rst b/docs/design_docs/software/tfm_code_generation_with_jinja2.rst
index fbdfbbc..05e6ba2 100644
--- a/docs/design_docs/software/tfm_code_generation_with_jinja2.rst
+++ b/docs/design_docs/software/tfm_code_generation_with_jinja2.rst
@@ -34,7 +34,7 @@
 call the Jinja2 template engine library from
 ``tools/tfm_parse_manifest_list.py`` to do the substitution.
 
-More information on jinja2: http://jinja.pocoo.org/
+More information on jinja2: https://jinja.palletsprojects.com/en/stable/
 
 Changes needed:
 ===============
diff --git a/docs/design_docs/software/tfm_cooperative_scheduling_rules.rst b/docs/design_docs/software/tfm_cooperative_scheduling_rules.rst
index 0b96f94..39f3edb 100644
--- a/docs/design_docs/software/tfm_cooperative_scheduling_rules.rst
+++ b/docs/design_docs/software/tfm_cooperative_scheduling_rules.rst
@@ -4,7 +4,6 @@
 
 :Author: Ashutosh Singh
 :Organization: Arm Limited
-:Contact: Ashutosh Singh <ashutosh.singh@arm.com>
 
 TF-M Scheduler - Rules
 ======================
diff --git a/docs/design_docs/tfm_builtin_keys.rst b/docs/design_docs/tfm_builtin_keys.rst
index b500932..907783c 100644
--- a/docs/design_docs/tfm_builtin_keys.rst
+++ b/docs/design_docs/tfm_builtin_keys.rst
@@ -259,9 +259,9 @@
 References
 **********
 
-.. [1] PSA cryptoprocessor driver interface: \ https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/psa-driver-interface.md
+.. [1] PSA cryptoprocessor driver interface: \ https://github.com/Mbed-TLS/TF-PSA-Crypto/blob/development/docs/proposed/psa-driver-interface.md
 .. [2] Definition of psa_key_location_t type in the PSA spec: \ https://arm-software.github.io/psa-api/crypto/1.1/api/keys/lifetimes.html#c.psa_key_location_t
-.. [3] Interface for platform keys: \ https://github.com/ARM-software/psa-crypto-api/issues/550
+.. [3] Interface for platform keys:  `https://github.com/ARM-software/psa-crypto-api/issues/550` (private)
 
 --------------
 
diff --git a/docs/design_docs/tfm_physical_attack_mitigation.rst b/docs/design_docs/tfm_physical_attack_mitigation.rst
index 29630ea..d91e5c0 100644
--- a/docs/design_docs/tfm_physical_attack_mitigation.rst
+++ b/docs/design_docs/tfm_physical_attack_mitigation.rst
@@ -625,7 +625,7 @@
 
 .. [1] `PSA Certified Level 3 Lightweight Protection Profile <https://www.psacertified.org/app/uploads/2020/11/JSADEN009-PSA_Certified_Level_3_LW_PP-1.0-ALP02.pdf>`_
 
-.. [2] `MCUboot project <https://github.com/mcu-tools/mcuboot/blob/master/boot/bootutil/include/bootutil/fault_injection_hardening.h>`_
+.. [2] `MCUboot project - fault injection hardening <https://github.com/mcu-tools/mcuboot/blob/master/boot/bootutil/include/bootutil/fault_injection_hardening.h>`_
 
 .. [3] `MCUboot fault injection mitigation <https://www.trustedfirmware.org/docs/TF-M_fault_injection_mitigation.pdf>`_
 
diff --git a/docs/getting_started/tfm_getting_started.rst b/docs/getting_started/tfm_getting_started.rst
index 46c4ced..0f473ec 100644
--- a/docs/getting_started/tfm_getting_started.rst
+++ b/docs/getting_started/tfm_getting_started.rst
@@ -34,7 +34,7 @@
 To port TF-M to a another system or OS, follow the
 :doc:`OS Integration Guide </integration_guide/index>`
 
-:doc:`Contributing Guidelines </contributing/contributing_process>` contains guidance on how to
+:doc:`Contributing Process </contributing/contributing_process>` contains guidance on how to
 contribute to this project.
 
 #########################
@@ -208,7 +208,7 @@
 
           .. group-tab:: Linux
 
-              - Download IAR build tools from `here <https://www.iar.com/products/architectures/arm/iar-embedded-workbench-for-arm>`__.
+              - Download IAR build tools from `here <https://www.iar.com/embedded-development-tools/iar-build-tools>`__.
               - Add IAR Arm compiler into environment:
 
                 .. code-block:: bash
@@ -217,7 +217,7 @@
 
           .. group-tab:: Windows
 
-              - Download IAR build tools from `here <https://www.iar.com/products/architectures/arm/iar-embedded-workbench-for-arm>`__.
+              - Download IAR build tools from `here <https://www.iar.com/embedded-development-tools/iar-build-tools>`__.
               - Add IAR Arm compiler into environment:
 
                 .. code-block:: bash
@@ -331,7 +331,7 @@
 
         1. install Arm Development Studio to get the fast-model.
 
-           Download Arm Development Studio from `here <https://developer.arm.com/tools-and-software/embedded/arm-development-studio>`__.
+           Download Arm Development Studio from `here <https://developer.arm.com/Tools%20and%20Software/Arm%20Development%20Studio#Downloads>`__.
 
         2. Add ``bl2.axf`` and ``tfm_s_ns_signed.bin`` to symbol files in Debug
            Configuration menu.
@@ -373,7 +373,7 @@
 
         1. install Arm Development Studio to get the fast-model.
 
-           Download Arm Development Studio from `here <https://developer.arm.com/tools-and-software/embedded/arm-development-studio>`__.
+           Download Arm Development Studio from `here <https://developer.arm.com/Tools%20and%20Software/Arm%20Development%20Studio#Downloads>`__.
 
         2. Add ``bl2.axf`` and ``tfm_s_ns_signed.bin`` to symbol files in Debug
            Configuration menu.
diff --git a/docs/glossary.rst b/docs/glossary.rst
index f2b9083..ad087b5 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -129,14 +129,14 @@
 | `Firmware Framework for M (FF-M)`_
 
 .. _Firmware Framework for M (FF-M):
-   https://www.arm.com/architecture/security-features/platform-security
+   https://developer.arm.com/documentation/aes0039/b/?lang=en
 
 .. _PSA term: `Firmware Framework for M (FF-M)`_
 
 | `Trusted Base System Architecture for M`_
 
 .. _Trusted Base System Architecture for M:
-   https://www.arm.com/architecture/security-features/platform-security
+   https://developer.arm.com/documentation/107610/0000/Overview/Compliance/Trusted-Base-System-Architecture-for-Armv8-M
 
 --------------
 
diff --git a/docs/integration_guide/non-secure_client_extension_integration_guide.rst b/docs/integration_guide/non-secure_client_extension_integration_guide.rst
index 6fd95ed..d8fcb1c 100644
--- a/docs/integration_guide/non-secure_client_extension_integration_guide.rst
+++ b/docs/integration_guide/non-secure_client_extension_integration_guide.rst
@@ -206,7 +206,7 @@
 
 - Built-in Secure Context Manager: An RTOS may have an existing built-in secure
   context manager with a group of secure context management APIs defined. Let's
-  take RTX which uses `Armv8-M TrustZone APIs <https://www.keil.com/pack/doc/CMSIS/Core/html/group__context__trustzone__functions.html>`_
+  take RTX which uses `Armv8-M TrustZone APIs <http://arm-software.github.io/CMSIS_6/latest/Core/using_TrustZone_pg.html>`_
   as the example.
 
 .. Note::
diff --git a/docs/integration_guide/platform/porting_tfm_to_a_new_hardware.rst b/docs/integration_guide/platform/porting_tfm_to_a_new_hardware.rst
index 3d7be09..3c688d4 100644
--- a/docs/integration_guide/platform/porting_tfm_to_a_new_hardware.rst
+++ b/docs/integration_guide/platform/porting_tfm_to_a_new_hardware.rst
@@ -29,8 +29,8 @@
 
 The TF-M stack requires at least two CMSIS HAL implementations:
 
-    - `USART <https://www.keil.com/pack/doc/CMSIS/Driver/html/group__usart__interface__gr.html>`_
-    - `FLASH <https://www.keil.com/pack/doc/CMSIS/Driver/html/group__flash__interface__gr.html>`_
+    - `USART <https://arm-software.github.io/CMSIS_6/latest/Driver/group__usart__interface__gr.html>`_
+    - `FLASH <https://arm-software.github.io/CMSIS_6/latest/Driver/group__flash__interface__gr.html>`_
 
 ************
 Porting flow
@@ -491,7 +491,7 @@
     drivers in the CMSIS functions or to use the CMSIS functions as a shim to
     your native drivers.
 
-    Refer to the CMSIS `FLASH <https://www.keil.com/pack/doc/CMSIS/Driver/html/group__flash__interface__gr.html>`_
+    Refer to the CMSIS `FLASH <https://arm-software.github.io/CMSIS_6/latest/Driver/group__flash__interface__gr.html>`_
     documentation.
 
 CMSIS_Driver/Driver_USART.c:
@@ -504,7 +504,7 @@
     drivers in the CMSIS functions or to use the CMSIS functions as a shim to
     your native drivers.
 
-    Refer to the CMSIS `USART <https://www.keil.com/pack/doc/CMSIS/Driver/html/group__usart__interface__gr.html>`_
+    Refer to the CMSIS `USART <https://arm-software.github.io/CMSIS_6/latest/Driver/group__usart__interface__gr.html>`_
     documentation.
 
 target_cfg.[ch]:
@@ -614,9 +614,9 @@
 
     This file contains the hardware information for the NSPE CPU.
     It should be installed to ``<Artifact folder>/platform`` for NSPE build,
-    ranamed to ``cpuarch.cmake``.
+    ranamed to ``ns/cpuarch_ns.cmake``.
 
-    [cpuarch.cmake_]
+    [`ns/cpuarch_ns.cmake`_]
 
 .. _Functions:
 
@@ -902,8 +902,6 @@
             $<$<BOOL:${PLATFORM_DEFAULT_CRYPTO_KEYS}>:PLATFORM_DEFAULT_CRYPTO_KEYS>
     )
 
-.. _cpuarch.cmake:
-
 *Copyright (c) 2021-2024, Arm Limited. All rights reserved.*
 
 *Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon company)
diff --git a/docs/integration_guide/services/tfm_crypto_integration_guide.rst b/docs/integration_guide/services/tfm_crypto_integration_guide.rst
index 0b8ee16..a8700d8 100644
--- a/docs/integration_guide/services/tfm_crypto_integration_guide.rst
+++ b/docs/integration_guide/services/tfm_crypto_integration_guide.rst
@@ -179,9 +179,9 @@
 ----------
 
 .. [1] PSA Crypto APIs: \ https://armmbed.github.io/mbed-crypto/html/
-.. [2] PSA cryptoprocessor driver interface: \ https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/psa-driver-interface.md
+.. [2] PSA cryptoprocessor driver interface: \ https://github.com/Mbed-TLS/TF-PSA-Crypto/blob/development/docs/proposed/psa-driver-interface.md
 .. [3] Mbed TLS library: \ https://www.trustedfirmware.org/projects/mbed-tls/
-.. [4] Interface for platform keys: \ https://github.com/ARM-software/psa-crypto-api/issues/550
+.. [4] Interface for platform keys:  `https://github.com/ARM-software/psa-crypto-api/issues/550` (private)
 
 
 --------------
diff --git a/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst b/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst
index 4a3432a..f588d5c 100644
--- a/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst
+++ b/docs/integration_guide/services/tfm_manifest_tool_user_guide.rst
@@ -297,9 +297,9 @@
 
 .. [3] `YAML <https://yaml.org/>`__
 
-.. [4] `TF-M manifest list <https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/tools/tfm_manifest_list.yaml>`__
+.. [4] `TF-M manifest list <https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m.git/+/HEAD/tools/tfm_manifest_list.yaml>`__
 
-.. [5] `TF-M generated file list <https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/tools/tfm_generated_file_list.yaml>`__
+.. [5] `TF-M generated file list <https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m.git/+/HEAD/tools/tfm_generated_file_list.yaml>`__
 
 .. [6] `Jinja2 <https://jinja.palletsprojects.com/en/3.1.x/>`__
 
diff --git a/docs/integration_guide/services/tfm_secure_partition_addition.rst b/docs/integration_guide/services/tfm_secure_partition_addition.rst
index 575b8ff..af8b25e 100644
--- a/docs/integration_guide/services/tfm_secure_partition_addition.rst
+++ b/docs/integration_guide/services/tfm_secure_partition_addition.rst
@@ -345,7 +345,7 @@
 
 Here is a reference example for `CMakeLists.txt`_
 
-.. _CMakeLists.txt: https://git.trustedfirmware.org/TF-M/tf-m-extras.git/tree/examples/example_partition/CMakeLists.txt
+.. _CMakeLists.txt: https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-extras/+/refs/heads/main/examples/example_partition/CMakeLists.txt
 
 The CMake file should include the following contents
 
@@ -639,12 +639,12 @@
 
 A regression test suite can be added to verify whether the new secure partition
 works as expected. Refer to
-`Adding TF-M Regression Test Suite <https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/docs/tfm_test_suites_addition.rst>`_
+`Adding TF-M Regression Test Suite <https://trustedfirmware-m.readthedocs.io/projects/tf-m-tests/en/latest/tfm_test_suites_addition.html#adding-a-new-test-suite>`_
 for the details of adding a regression test suite.
 
 Some regression tests require a dedicated RoT service. The implementations of
 the RoT service for test are similar to secure partition addition. Refer to
-`Adding partitions for regression tests <https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/docs/tfm_test_partitions_addition.rst>`_
+`Adding partitions for regression tests <https://trustedfirmware-m.readthedocs.io/projects/tf-m-tests/en/latest/tfm_test_partitions_addition.html>`_
 to get more information.
 
 Out-of-tree Secure Partition build
diff --git a/docs/integration_guide/tfm_fpu_support.rst b/docs/integration_guide/tfm_fpu_support.rst
index b7bb2c0..775a987 100644
--- a/docs/integration_guide/tfm_fpu_support.rst
+++ b/docs/integration_guide/tfm_fpu_support.rst
@@ -147,7 +147,7 @@
 
 .. [6] :doc:`Secure Interrupt Integration Guide </integration_guide/tfm_secure_irq_integration_guide>`
 
-.. [7] `Musca-S1 Test Chip Board <https://developer.arm.com/tools-and-software/development-boards/iot-test-chips-and-boards/musca-s1-test-chip-board>`_
+.. [7] `Musca-S1 Test Chip Board <https://developer.arm.com/documentation/101835/0000/?lang=en>`_
 
 .. [8] `GCC Issue on '-mcpu=cortex-m55' conflicts with '-march=armv8.1-m.main' Warning <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97327>`_
 
diff --git a/docs/integration_guide/tfm_secure_irq_integration_guide.rst b/docs/integration_guide/tfm_secure_irq_integration_guide.rst
index 59aafed..80213eb 100644
--- a/docs/integration_guide/tfm_secure_irq_integration_guide.rst
+++ b/docs/integration_guide/tfm_secure_irq_integration_guide.rst
@@ -396,9 +396,9 @@
 
 .. [2] `FF-M v1.1 Extension <https://developer.arm.com/documentation/aes0039/latest/>`__
 
-.. [3] https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/tests_reg/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service
+.. [3] https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-tests.git/+/HEAD/tests_reg/test/secure_fw/suites/spm/irq/service/tfm_flih_test_service/
 
-.. [4] https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/tests_reg/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service
+.. [4] https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-tests.git/+/HEAD/tests_reg/test/secure_fw/suites/spm/irq/service/tfm_slih_test_service/
 
 --------------
 
diff --git a/docs/introduction/readme.rst b/docs/introduction/readme.rst
index 31cc765..a901910 100644
--- a/docs/introduction/readme.rst
+++ b/docs/introduction/readme.rst
@@ -61,13 +61,13 @@
 
     * - **Repository**
       - **Description**
-    * - `trusted-firmware-m <https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/tree/>`_
+    * - `trusted-firmware-m <https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m.git/+/refs/heads/main>`_
       - Software implementation of TF-M with documentation and essential tools
-    * - `tf-m-tests <https://git.trustedfirmware.org/TF-M/tf-m-tests.git/tree/>`_
+    * - `tf-m-tests <https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-tests.git/+/refs/heads/main>`_
       - Tests that focus on the functionalities of TF-M components
-    * - `tf-m-tools <https://git.trustedfirmware.org/TF-M/tf-m-tools.git/tree/>`_
+    * - `tf-m-tools <https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-tools.git/+/refs/heads/main>`_
       - Non essential tools used for testing and verification of TF-M
-    * - `tf-m-extras <https://git.trustedfirmware.org/TF-M/tf-m-extras.git/tree/>`_
+    * - `tf-m-extras <https://git.trustedfirmware.org/plugins/gitiles/TF-M/tf-m-extras.git/+/refs/heads/main>`_
       - Extension of the main repository to host examples, demonstrations, third-party modules etc
 
 #######
@@ -75,7 +75,7 @@
 #######
 The software is provided under a BSD-3-Clause :doc:`License </contributing/lic>`.
 Contributions to this project are accepted under the same license with developer
-sign-off as described in the :doc:`Contributing Guidelines </contributing/contributing_process>`.
+sign-off as described in the :doc:`Contributing Process </contributing/contributing_process>`.
 
 This project contains code from other projects as listed below. The code from
 external projects is limited to ``bl2``, ``lib`` and ``platform``
@@ -94,7 +94,7 @@
    - ``mcuboot``    - `Apache 2.0 license MCUBoot
      <https://github.com/mcu-tools/mcuboot/blob/main/LICENSE>`_
    - ``qcbor``      - `Modified BSD-3-Clause license
-     <https://github.com/laurencelundblade/QCBOR#copyright-and-license>`_
+     <https://github.com/laurencelundblade/QCBOR/blob/master/LICENSE>`_
    - ``tf-m-extras`` - Set of additional components. Please check individually in
      `tf-m-extras repository <https://git.trustedfirmware.org/TF-M/tf-m-extras.git/tree/>`_
 
diff --git a/docs/platform/arm/corstone1000/readme.rst b/docs/platform/arm/corstone1000/readme.rst
index cfb29b6..144fbf8 100644
--- a/docs/platform/arm/corstone1000/readme.rst
+++ b/docs/platform/arm/corstone1000/readme.rst
@@ -168,13 +168,13 @@
 
    .. _Enabled tests:
 
-   Some of the regression tests have to be disabled as adding all of them would
-   exceed the available RAM size. So there is a need to select few tests but
-   not all. Other test configurations can be found in the
+   Enabled Tests: Some of the regression tests have to be disabled as adding all
+   of them would exceed the available RAM size. So there is a need to select few
+   tests but not all. Other test configurations can be found in the
    :doc:`Test Configuration </configuration/test_configuration>`.
 
 
 *Copyright (c) 2021-2025, Arm Limited. All rights reserved.*
 
-.. _Arm Ecosystem FVPs: https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps
+.. _Arm Ecosystem FVPs: https://developer.arm.com/documentation/100966/1128/Arm--Corstone-1000-FVP?lang=en
 .. _Arm Corstone-1000 User Guide: https://corstone1000.docs.arm.com/en/latest/user-guide.html
diff --git a/docs/platform/arm/mps3/corstone300/README.rst b/docs/platform/arm/mps3/corstone300/README.rst
index b6f4749..30135a9 100644
--- a/docs/platform/arm/mps3/corstone300/README.rst
+++ b/docs/platform/arm/mps3/corstone300/README.rst
@@ -97,7 +97,7 @@
 
 To run the example code on Corstone SSE-300 with Ethos-U55/U65 Example Subsystem for MPS3 (AN547)
 -------------------------------------------------------------------------------------------------
-FPGA image is available to download `here <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`__
+FPGA image is available to download `here <https://developer.arm.com/downloads/view/AN547?entitled=true&term=an547&sortBy=availableBy>`__
 
 If the link above is not working just go to `Arm PDH <https://developer.arm.com/downloads>`__ and search for AN547.
 
@@ -163,7 +163,7 @@
 
 To run the example code on Corstone SSE-300 with Ethos-U55/U65 Example Subsystem for MPS3 (AN552)
 -------------------------------------------------------------------------------------------------
-FPGA image is available to download `here <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`__
+FPGA image is available to download `here <https://developer.arm.com/downloads/view/AN552?sortBy=availableBy&revision=r4p0-00rel0-1>`__
 
 If the link above is not working just go to `Arm PDH <https://developer.arm.com/downloads>`__ and search for AN552.
 
diff --git a/docs/platform/arm/mps3/corstone310/README.rst b/docs/platform/arm/mps3/corstone310/README.rst
index e45b543..fdd6821 100644
--- a/docs/platform/arm/mps3/corstone310/README.rst
+++ b/docs/platform/arm/mps3/corstone310/README.rst
@@ -91,7 +91,7 @@
 
 To run the example code on Corstone SSE-310 with Ethos-U55/U65 Example Subsystem for MPS3 (AN555)
 -------------------------------------------------------------------------------------------------
-FPGA image is available to download `here <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`__
+FPGA image is available to download `here <https://developer.arm.com/downloads/view/AN555?sortBy=availableBy&revision=r3p0-00rel0-1>`__
 
 If the link above is not working just go to `Arm PDH <https://developer.arm.com/downloads>`__ and search for AN555.
 
@@ -164,7 +164,7 @@
 
 To run the example code on Corstone-310 Ethos-U55/U65 Ecosystem FVP
 -------------------------------------------------------------------
-FVP is available to download `here <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`__
+FVP is available to download `here <https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms/IoT%20FVPs>`__
 
 #. Install the FVP
 #. Copy ``bl2.axf`` and ``tfm_s_ns_signed.bin`` files from
diff --git a/docs/platform/arm/mps4/corstone315/README.rst b/docs/platform/arm/mps4/corstone315/README.rst
index ac8cf19..d82a553 100644
--- a/docs/platform/arm/mps4/corstone315/README.rst
+++ b/docs/platform/arm/mps4/corstone315/README.rst
@@ -74,7 +74,7 @@
 
 To run the example code on Corstone-315 Ethos-U65 Ecosystem FVP
 ---------------------------------------------------------------
-FVP is available to download `here <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`__
+FVP is available to download `here <https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms/IoT%20FVPs>`__
 
 #. Install the FVP
 #. Copy ``bl1_1.bin``, ``cm_provisioning_bundle.bin``, ``dm_provisioning_bundle.bin``,
diff --git a/docs/platform/arm/mps4/corstone320/README.rst b/docs/platform/arm/mps4/corstone320/README.rst
index 47fd621..53f1f40 100644
--- a/docs/platform/arm/mps4/corstone320/README.rst
+++ b/docs/platform/arm/mps4/corstone320/README.rst
@@ -74,7 +74,7 @@
 
 To run the example code on Corstone-320 Ethos-U85 Ecosystem FVP
 ---------------------------------------------------------------
-FVP is available to download `here <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`__
+FVP is available to download `here <https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms/IoT%20FVPs>`__
 
 #. Install the FVP
 #. Copy ``bl1_1.bin``, ``cm_provisioning_bundle.bin``, ``dm_provisioning_bundle.bin``,
diff --git a/docs/platform/arm/rse/platforms/rd1ae/readme.rst b/docs/platform/arm/rse/platforms/rd1ae/readme.rst
index 3b882de..e12f014 100644
--- a/docs/platform/arm/rse/platforms/rd1ae/readme.rst
+++ b/docs/platform/arm/rse/platforms/rd1ae/readme.rst
@@ -96,4 +96,4 @@
 *Copyright (c) 2024, Arm Limited. All rights reserved.*
 
 .. _Arm Automotive Solutions Documentation: https://kronos-ref-stack.docs.arm.com/
-.. _Arm Automotive Solutions User Guide: https://kronos-ref-stack.docs.arm.com/en/latest/user_guide/reproduce.html
+.. _Arm Automotive Solutions User Guide: https://arm-auto-solutions.docs.arm.com/en/v1.1.1/user_guide/index.html
diff --git a/docs/platform/cypress/psoc64/cypress_psoc64_spec.rst b/docs/platform/cypress/psoc64/cypress_psoc64_spec.rst
index d786eb5..ced3920 100644
--- a/docs/platform/cypress/psoc64/cypress_psoc64_spec.rst
+++ b/docs/platform/cypress/psoc64/cypress_psoc64_spec.rst
@@ -8,7 +8,7 @@
 
 PSoC64 must first be provisioned with SecureBoot firmware and a provisioning packet
 containing policy and secure keys. Please refer to the guide at
-https://www.cypress.com/documentation/software-and-drivers/psoc-64-secure-mcu-secure-boot-sdk-user-guide
+https://www.infineon.com/dgdl/Infineon-PSoC_64_Secure_MCU_Secure_Boot_SDK_User_Guide-Software-v07_00-EN.pdf?fileId=8ac78c8c7d0d8da4017d0f8c361a7666
 Use the following policy file for provisioning and signing:
 policy_multi_CM0_CM4_tfm.json
 
@@ -32,7 +32,7 @@
 
 Install OpenOCD with PSoC6 support. Download the latest revision 4.1.0
 or newer from:
-https://github.com/cypresssemiconductorco/openocd/releases
+https://github.com/openocd-org/openocd/releases
 
 Lastly, the PSoC64 board KitProg firmware needs to be 2.00.744 or greater.
 Please use Cypress Modus Toolbox or CyProgrammer to update it if needed.
@@ -194,7 +194,7 @@
 
 Note: provisioned board in SECURE state is required, otherwise refer to
 Cypress documentation for details on the provisioning process.
-https://www.cypress.com/documentation/software-and-drivers/psoc-64-secure-mcu-secure-boot-sdk-user-guide
+https://www.infineon.com/dgdl/Infineon-PSoC_64_Secure_MCU_Secure_Boot_SDK_User_Guide-Software-v07_00-EN.pdf?fileId=8ac78c8c7d0d8da4017d0f8c361a7666
 
 If the board was previously provisioned with signing keys and policy, copy
 secure signing keys used in the board provisioning process to
diff --git a/docs/platform/cypress/psoc64/libs/core-lib/README.md b/docs/platform/cypress/psoc64/libs/core-lib/README.md
index f88003c..ed2deeb 100644
--- a/docs/platform/cypress/psoc64/libs/core-lib/README.md
+++ b/docs/platform/cypress/psoc64/libs/core-lib/README.md
@@ -46,10 +46,10 @@
     * `CY_RAMFUNC_END`
 
 ## More information
-* [API Reference Guide](https://cypresssemiconductorco.github.io/core-lib/html/modules.html)
-* [Cypress Semiconductor, an Infineon Technologies Company](http://www.cypress.com)
+* [API Reference Guide](https://infineon.github.io/core-lib/html/modules.html)
+* [Cypress Semiconductor, an Infineon Technologies Company](https://www.infineon.com/cms/en/product/promopages/cypress-product-families/)
 * [Cypress Semiconductor GitHub](https://github.com/cypresssemiconductorco)
-* [ModusToolbox](https://www.cypress.com/products/modustoolbox-software-environment)
+* [ModusToolbox](https://www.infineon.com/cms/en/design-support/tools/sdk/modustoolbox-software/)
 
 ---
 © Cypress Semiconductor Corporation, 2019-2020.
diff --git a/docs/platform/cypress/psoc64/libs/core-lib/RELEASE.md b/docs/platform/cypress/psoc64/libs/core-lib/RELEASE.md
index a94c9a9..a3cc52f 100644
--- a/docs/platform/cypress/psoc64/libs/core-lib/RELEASE.md
+++ b/docs/platform/cypress/psoc64/libs/core-lib/RELEASE.md
@@ -72,10 +72,10 @@
 
 ### More information
 Use the following links for more information, as needed:
-* [API Reference Guide](https://cypresssemiconductorco.github.io/core-lib/html/modules.html)
-* [Cypress Semiconductor, an Infineon Technologies Company](http://www.cypress.com)
+* [API Reference Guide](https://infineon.github.io/core-lib/html/modules.html)
+* [Cypress Semiconductor, an Infineon Technologies Company](https://www.infineon.com/cms/en/product/promopages/cypress-product-families/)
 * [Cypress Semiconductor GitHub](https://github.com/cypresssemiconductorco)
-* [ModusToolbox](https://www.cypress.com/products/modustoolbox-software-environment)
+* [ModusToolbox](https://www.infineon.com/cms/en/design-support/tools/sdk/modustoolbox-software/)
 
 ---
 © Cypress Semiconductor Corporation, 2019-2020.
\ No newline at end of file
diff --git a/docs/platform/nxp/lpcxpresso55s69/README.rst b/docs/platform/nxp/lpcxpresso55s69/README.rst
index 0cecd73..f5b6f2e 100644
--- a/docs/platform/nxp/lpcxpresso55s69/README.rst
+++ b/docs/platform/nxp/lpcxpresso55s69/README.rst
@@ -58,7 +58,7 @@
 ***************************
 
 PyOCD is an open source Python package for programming and debugging Arm Cortex-M microcontrollers using multiple supported types of USB debug probes.
-See: `PyOCD <https://pypi.org/project/pyocd/>`
+See: `PyOCD <https://pypi.org/project/pyocd/>`_
 
 If you built TF-M with the BL2 secondary bootloader, use the following commands:
 
diff --git a/docs/platform/platform_introduction.rst b/docs/platform/platform_introduction.rst
index 283b3f2..cea9950 100644
--- a/docs/platform/platform_introduction.rst
+++ b/docs/platform/platform_introduction.rst
@@ -5,32 +5,32 @@
     - Cortex-M85 system:
 
         - `Corstone-310 Ethos-U55/U65 Ecosystem FVP.
-          <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`_
+          <https://developer.arm.com/Tools%20and%20Software/Fixed%20Virtual%20Platforms/IoT%20FVPs>`_
         - `FPGA image loaded on MPS3 board (AN555).
-          <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`_
+          <https://developer.arm.com/documentation/107642/B/?lang=en>`_
 
     - Cortex-M55 system:
 
         - `FPGA image loaded on MPS3 board (AN547).
-          <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`_
+          <https://developer.arm.com/downloads/view/AN547?sortBy=availableBy&revision=r3p0-00rel0-1>`_
         - `FPGA image loaded on MPS3 board (AN552).
-          <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`_
+          <https://developer.arm.com/downloads/view/AN552?sortBy=availableBy&revision=r4p0-00rel0-1>`_
         - `Corstone-300 Ethos-U55/U65 Ecosystem FVP.
-          <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`_
+          <https://developer.arm.com/Processors/Corstone-300#Tools-and-Software>`_
 
 
     - Cortex-M33 system:
 
         - `FPGA image loaded on MPS2 board (AN521).
-          <https://developer.arm.com/products/system-design/development-boards/cortex-m-prototyping-systems/mps2>`_
+          <https://developer.arm.com/Tools%20and%20Software/MPS2%20Plus%20FPGA%20Prototyping%20Board>`_
         - `Fast model FVP_MPS2_AEMv8M (AN521).
-          <https://developer.arm.com/products/system-design/fixed-virtual-platforms>`_
+          <https://developer.arm.com/documentation/107925/1129/Fast-Models-trace-components/ARM-AEMv8M?lang=en>`_
         - `Musca-B1 test chip board.
           <https://developer.arm.com/Tools%20and%20Software/Musca-B1%20Test%20Chip%20Board>`_
         - `Musca-S1 test chip board.
           <https://developer.arm.com/Tools%20and%20Software/Musca-S1%20Test%20Chip%20Board>`_
         - `FPGA image loaded on MPS3 board (AN524).
-          <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/mps3>`_
+          <https://developer.arm.com/documentation/107789/0100/?lang=en>`_
         - `LPC55S69.
           <https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc5500-cortex-m33/lpcxpresso55s69-development-board:LPC55S69-EVK>`_
         - `STM32H573I-DK.
@@ -46,14 +46,14 @@
         - `nRF5340 DK (nordic_nrf/nrf5340dk_nrf5340_cpuapp).
           <https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-DK>`_
         - `BL5340 DVK (lairdconnectivity/bl5340_dvk_cpuapp).
-          <https://www.lairdconnect.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl5340-series-multi-core-bluetooth-52-802154-nfc-modules>`_
+          <https://www.ezurio.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl5340-series-multi-core-bluetooth-52-802154-nfc-modules>`_
         - `MAX32657 (adi/max32657).
-          <https://www.analog.com/en/products/max32657.html>`_
+          <https://docs.zephyrproject.org/latest/boards/adi/max32657evkit/doc/index.html>`_
 
     - Cortex-M23 system:
 
         - `FPGA image loaded on MPS2 board (AN519).
-          <https://developer.arm.com/products/system-design/development-boards/cortex-m-prototyping-systems/mps2>`_
+          <https://developer.arm.com/downloads/view/AN519?sortBy=availableBy&revision=r0p0-00rel0>`_
         - `M2351.
           <https://www.nuvoton.com/products/iot-solution/iot-platform/numaker-pfm-m2351/>`_
         - `M2354.
diff --git a/docs/releases/1.0.rst b/docs/releases/1.0.rst
index 8bff022..894f8c6 100644
--- a/docs/releases/1.0.rst
+++ b/docs/releases/1.0.rst
@@ -48,17 +48,18 @@
 
     - Cortex M33 based SSE-200 system:
 
-        - `FPGA image loaded on MPS2 board.
-          <https://developer.arm.com/products/system-design/development-boards/cortex-m-prototyping-systems/mps2>`__
-        - `Fast model FVP_MPS2_AEMv8M.
-          <https://developer.arm.com/products/system-design/fixed-virtual-platforms>`__
+        - `FPGA image loaded on MPS2 board (AN521).
+          <https://developer.arm.com/Tools%20and%20Software/MPS2%20Plus%20FPGA%20Prototyping%20Board>`__
+        - `Fast model FVP_MPS2_AEMv8M (AN521).
+          <https://developer.arm.com/documentation/107925/1129/Fast-Models-trace-components/ARM-AEMv8M?lang=en>`__
         - `Musca-A test chip board.
-          <https://developer.arm.com/products/system-design/development-boards/iot-test-chips-and-boards/musca-a-test-chip-board>`__
+          <https://developer.arm.com/documentation/101107/0000/?lang=en>`__
         - `Musca-B1 test chip board.
-          <https://developer.arm.com/products/system-design/development-boards/iot-test-chips-and-boards/musca-b-test-chip-board>`__
-        - `Musca-S1 test chip board.`
-        - `FPGA image loaded on MPS3 board.
-          <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/mps3>`__
+          <https://developer.arm.com/documentation/110409/0100/?lang=en>`__
+        - `Musca-S1 test chip board.
+          <https://developer.arm.com/documentation/110387/0100/?lang=en>`__
+        - `FPGA image loaded on MPS3 board (AN524).
+          <https://developer.arm.com/documentation/107789/0100/?lang=en>`__
         - `Arm DesignStart FPGA on AWS Cloud.
           <https://developer.arm.com/docs/101965/0102/arm-designstart-fpga-on-cloud-arm-ds-getting-started>`__
 
@@ -83,8 +84,8 @@
   This is because AN524 uses QSPI Flash for runtime memory as the RAM is small.
   The slow speed of QSPI device causes the tests to run slowly.
 
-- Warm reset of eFlash is not permitted on Musca-B1 due to HW bug
-  https://community.arm.com/developer/tools-software/oss-platforms/w/docs/426/musca-b1-warm-reset-of-eflash
+- Warm reset of eFlash is not permitted on Musca-B1 due to HW bug :
+  https://developer.arm.com/documentation/110409/0100/Musca-B1-warm-reset-of-eFlash
   As TF-M is executed in place from eFlash on Musca-B1, there is good chance
   that a warm reset of the board will have unexpected (even non-deterministic)
   effects on code execution. Hence the PSA Arch FF tests, which rely of warm
diff --git a/docs/releases/1.2.0.rst b/docs/releases/1.2.0.rst
index 2b61d12..7413e8b 100644
--- a/docs/releases/1.2.0.rst
+++ b/docs/releases/1.2.0.rst
@@ -37,11 +37,11 @@
 - Cortex-M33 based system:
 
   - `Nordic nRF9160 DK (nordic_nrf/nrf9160dk_nrf9160).
-    <https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF9160-DK>`_
+    <https://www.nordicsemi.com/Products/Development-hardware/nrf9160-dk>`_
   - `Nordic nRF5340 PDK (nordic_nrf/nrf5340pdk_nrf5340_cpuapp).
-    <https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK>`_
+    <https://www.nordicsemi.com/Products/Development-hardware/nrf5340-pdk>`_
   - `Nordic nRF5340 DK (nordic_nrf/nrf5340dk_nrf5340_cpuapp).
-    <https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK>`_
+    <https://www.nordicsemi.com/Products/Development-hardware/nrf5340-dk>`_
 
 - Cortex-M23 based system:
 
@@ -51,7 +51,7 @@
 - Cortex-M55 based system:
 
   - `Corstone-300 Ethos-U55 FVP (Cortex-M55 plus Ethos-U55 SSE-300 MPS3).
-    <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`_
+    <https://developer.arm.com/Processors/Corstone-300#Tools-and-Software>`_
 
 Tested platforms
 ================
diff --git a/docs/releases/1.3.0.rst b/docs/releases/1.3.0.rst
index 6610f73..ab6c35e 100644
--- a/docs/releases/1.3.0.rst
+++ b/docs/releases/1.3.0.rst
@@ -46,7 +46,7 @@
   - Cortex-M55 based system:
 
     - `FPGA image loaded on MPS3 board (AN547).
-      <https://developer.arm.com/products/system-design/development-boards/cortex-m-prototyping-systems/mps3>`_
+      <https://developer.arm.com/downloads/view/AN547?sortBy=availableBy&revision=r3p0-00rel0-1>`_
 
   - Secure Enclave system:
 
@@ -144,7 +144,7 @@
       | However, CryptoCell-312 doesn't support MD5 and uses other algorithms
       | instead. Therefore, Mbed TLS implementation may fail when input
       | algorithm doesn't match other parameters.
-    - https://github.com/ARMmbed/mbedtls/issues/3990
+    - https://github.com/Mbed-TLS/mbedtls/issues/3990
 
   * - | Regression tests fail with GNU Arm Embedded toolchain version
       | 10-2020-q4-major.
diff --git a/docs/releases/1.4.0.rst b/docs/releases/1.4.0.rst
index f07aed0..84510a9 100644
--- a/docs/releases/1.4.0.rst
+++ b/docs/releases/1.4.0.rst
@@ -34,7 +34,7 @@
   - Cortex-M33 based system:
 
     - `BL5340 DVK.
-      <https://www.lairdconnect.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl5340-series-multi-core-bluetooth-52-802154-nfc-modules>`_
+      <https://www.ezurio.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl5340-series-multi-core-bluetooth-52-802154-nfc-modules>`_
 
 Deprecated platforms
 ====================
diff --git a/docs/releases/1.5.0.rst b/docs/releases/1.5.0.rst
index e8a28f1..633311e 100644
--- a/docs/releases/1.5.0.rst
+++ b/docs/releases/1.5.0.rst
@@ -45,7 +45,7 @@
 
   - :doc:`Corstone-1000 </platform/arm/corstone1000/readme>`
 
-  - :doc:`Corstone-Polaris </platform/arm/mps3/corstone310/README>`
+  - :doc:`Corstone-310 (formerly Polaris) </platform/arm/mps3/corstone310/README>`
 
   - :doc:`B-U585I-IOT02A </platform/stm/b_u585i_iot02a/readme>`
 
diff --git a/docs/releases/1.6.0.rst b/docs/releases/1.6.0.rst
index 0ebdded..0852926 100644
--- a/docs/releases/1.6.0.rst
+++ b/docs/releases/1.6.0.rst
@@ -94,7 +94,7 @@
 =========
 
 
-.. [1] `PSA Unified Driver spec <https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/psa-driver-interface.md>`_
+.. [1] `PSA Unified Driver spec <https://github.com/Mbed-TLS/TF-PSA-Crypto/blob/development/docs/proposed/psa-driver-interface.md>`_
 
 .. [2] `Arm Compiler 6.18 release note: <https://developer.arm.com/documentation/107814/latest/>`_
 
diff --git a/docs/releases/1.7.0.rst b/docs/releases/1.7.0.rst
index 196cb6e..09cc0d1 100644
--- a/docs/releases/1.7.0.rst
+++ b/docs/releases/1.7.0.rst
@@ -136,7 +136,7 @@
 Reference
 =========
 
-.. [1] `Firmware Framework for M (FF-M) <https://www.arm.com/architecture/security-features/platform-security>`_
+.. [1] `Firmware Framework for M (FF-M) <https://developer.arm.com/documentation/den0063/latest>`_
 .. [2] `Arm Firmware Framework for M 1.1 Extensions <https://developer.arm.com/documentation/aes0039/latest>`_
 .. [3] `SESIP Profile for PSA Certified ARoT-less Level 2 <https://www.psacertified.org/app/uploads/2022/10/JSADEN019-PSA_Certified_Level_2_PP_SESIP_ARoT-less_REL-01.pdf>`_
 .. [4] `PSA Arch framework test results <https://developer.trustedfirmware.org/w/tf_m/release/psa_arch_crypto_test_failure_analysis_in_tf-m_v1.7_release>`_
diff --git a/docs/security/security_advisories/cc3xx_partial_tag_compare_on_chacha20_poly1305.rst b/docs/security/security_advisories/cc3xx_partial_tag_compare_on_chacha20_poly1305.rst
index a2d0387..b7ba6a3 100644
--- a/docs/security/security_advisories/cc3xx_partial_tag_compare_on_chacha20_poly1305.rst
+++ b/docs/security/security_advisories/cc3xx_partial_tag_compare_on_chacha20_poly1305.rst
@@ -5,13 +5,13 @@
 | Title           | Partial tag comparison when using Chacha20-Poly1305 on the |
 |                 | PSA driver API interface in CryptoCell enabled platforms   |
 +=================+============================================================+
-| CVE ID          | CVE-2023-40271                                             |
+| CVE ID          | `CVE-2023-40271`_                                          |
 +-----------------+------------------------------------------------------------+
 | Public          | 04/09/2023                                                 |
 | Disclosure Date |                                                            |
 +-----------------+------------------------------------------------------------+
-| Versions        | TF-M v1.6.0, TF-M v1.6.1, TF-M v1.7.0, TF-M v1.8.0         |
-| Affected        |                                                            |
+| Versions        | TF-M `v1.6.0`_, TF-M `v1.6.1`_, TF-M `v1.7.0`_,            |
+| Affected        | TF-M `v1.8.0`_                                             |
 +-----------------+------------------------------------------------------------+
 | Configurations  | CC312 enabled platforms, where the legacy driver API is    |
 |                 | disabled (``CC312_LEGACY_DRIVER_API_ENABLED=OFF``) and the |
@@ -24,7 +24,7 @@
 |                 | as authentic by comparing only the first 4 bytes of the    |
 |                 | authentication tag instead of the full length of 16 bytes  |
 +-----------------+------------------------------------------------------------+
-| Fix Version     | 2e82124af, TF-M v1.8.1                                     |
+| Fix Version     | `2e82124af29b58abcc98608196a63b3c5daf603b`_, TF-M `v1.8.1`_|
 +-----------------+------------------------------------------------------------+
 | Credit          | Nordic Semiconductor                                       |
 +-----------------+------------------------------------------------------------+
@@ -140,8 +140,16 @@
 ----------
 
 .. [1] Chacha20 and Poly1305 for IETF Protocols: \ https://datatracker.ietf.org/doc/html/rfc7539
-.. [2] PSA Cryptographic API v1.1: \ https://armmbed.github.io/mbed-crypto/html/
-.. [3] PSA Unified Driver interface: \ https://github.com/Mbed-TLS/mbedtls/blob/development/docs/proposed/psa-driver-interface.md
+.. [2] PSA Cryptographic API v1.1: \ https://arm-software.github.io/psa-api/crypto/1.1/index.html
+.. [3] PSA Unified Driver interface: \ https://github.com/Mbed-TLS/TF-PSA-Crypto/blob/development/docs/proposed/psa-driver-interface.md
+.. _CVE-2023-40271: https://www.cve.org/CVERecord?id=CVE-2023-40271
+.. _v1.6.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.6.0
+.. _v1.6.1: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.6.1
+.. _v1.7.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.7.0
+.. _v1.8.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.8.0
+.. _2e82124af29b58abcc98608196a63b3c5daf603b: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/2e82124af29b58abcc98608196a63b3c5daf603b
+.. _v1.8.1: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.8.1
+
 
 ---------------------
 
diff --git a/docs/security/security_advisories/crypto_multi_part_ops_abort_fail.rst b/docs/security/security_advisories/crypto_multi_part_ops_abort_fail.rst
index a450de3..255a69e 100644
--- a/docs/security/security_advisories/crypto_multi_part_ops_abort_fail.rst
+++ b/docs/security/security_advisories/crypto_multi_part_ops_abort_fail.rst
@@ -5,12 +5,12 @@
 | Title           | ``abort()`` function may not take effect in TF-M Crypto    |
 |                 | multi-part MAC/hashing/cipher operations.                  |
 +=================+============================================================+
-| CVE ID          | CVE-2021-32032                                             |
+| CVE ID          | `CVE-2021-32032`_                                          |
 +-----------------+------------------------------------------------------------+
 | Public          | May 10, 2021                                               |
 | Disclosure Date |                                                            |
 +-----------------+------------------------------------------------------------+
-| Versions        | Affected all versions up to and including TF-M v1.3.0      |
+| Versions        | Affected all versions up to and including TF-M `v1.3.0`_   |
 | Affected        |                                                            |
 +-----------------+------------------------------------------------------------+
 | Configurations  | All                                                        |
@@ -19,7 +19,7 @@
 |                 | eventually making TF-M Crypto service unavailable and      |
 |                 | impacting other services relied on it.                     |
 +-----------------+------------------------------------------------------------+
-| Fix Version     | commit `7e2e52`_                                           |
+| Fix Version     | commit `7e2e523a1c4e9ac7b9cc4fd551831f7639ed5ff9`_         |
 +-----------------+------------------------------------------------------------+
 | Credit          | | Chongqing Lei, Southeast University                      |
 |                 | | Zhen Ling, Associate Professor, Southeast University     |
@@ -202,7 +202,9 @@
    Crypto API specification to call ``abort()`` when an error occurs during
    multi-part crypto operations.
 
-.. _7e2e52: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=7e2e523a1c4e9ac7b9cc4fd551831f7639ed5ff9
+.. _7e2e523a1c4e9ac7b9cc4fd551831f7639ed5ff9: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=7e2e523a1c4e9ac7b9cc4fd551831f7639ed5ff9
+.. _CVE-2021-32032: https://www.cve.org/CVERecord?id=CVE-2021-32032
+.. _v1.3.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.3.0
 
 ---------------------
 
diff --git a/docs/security/security_advisories/debug_log_vulnerability.rst b/docs/security/security_advisories/debug_log_vulnerability.rst
index 279dca0..b3283e1 100644
--- a/docs/security/security_advisories/debug_log_vulnerability.rst
+++ b/docs/security/security_advisories/debug_log_vulnerability.rst
@@ -9,7 +9,7 @@
 | Public           | The issue was publicly reported on 2023.12.04             |
 | Disclosure Date  |                                                           |
 +------------------+-----------------------------------------------------------+
-| Versions         | All version up to TF-M v2.0.0 inclusive                   |
+| Versions         | All version up to TF-M `v2.0.0`_ inclusive                |
 | Affected         |                                                           |
 +------------------+-----------------------------------------------------------+
 | Configurations   | IPC mode with TFM_SP_LOG_RAW_ENABLED=1                    |
@@ -62,8 +62,10 @@
 is added to the logging function of the SVC handler. If the check fails
 then ``tfm_core_panic()`` is invoked and system halts.
 
-.. _CVE-2023-51712: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-51712
+.. _CVE-2023-51712: https://www.cve.org/CVERecord?id=CVE-2023-51712
 
 ---------------------
 
+.. _v2.0.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv2.0.0
+
 *Copyright (c) 2024, Arm Limited. All rights reserved.*
diff --git a/docs/security/security_advisories/fwu_write_vulnerability.rst b/docs/security/security_advisories/fwu_write_vulnerability.rst
index e099f1c..2371f0e 100644
--- a/docs/security/security_advisories/fwu_write_vulnerability.rst
+++ b/docs/security/security_advisories/fwu_write_vulnerability.rst
@@ -4,13 +4,13 @@
 +-----------------+------------------------------------------------------------+
 | Title           | ``psa_fwu_write()`` may cause buffer overflow in SPE.      |
 +=================+============================================================+
-| CVE ID          | CVE-2021-43619                                             |
+| CVE ID          | `CVE-2021-43619`_                                          |
 +-----------------+------------------------------------------------------------+
 | Public          | Feb 11, 2022                                               |
 | Disclosure Date |                                                            |
 +-----------------+------------------------------------------------------------+
-| Versions        | From `3e7129f`_ to `921d0ea`_                              |
-| Affected        |                                                            |
+| Versions        | From `3e7129f552c4cfd2973b9c17f3565df1ba45b334`_ to        |
+| Affected        | `921d0eaa85595e9b992de866b9da8b0d7dfe08eb`_                |
 +-----------------+------------------------------------------------------------+
 | Configurations  | IPC model with Firmware Update partition enabled           |
 +-----------------+------------------------------------------------------------+
@@ -18,7 +18,7 @@
 |                 | or NSPE can overwrite the stack memory outside of the      |
 |                 | local buffer in Firmware Update partition.                 |
 +-----------------+------------------------------------------------------------+
-| Fix Version     | commit `78f7530`_                                          |
+| Fix Version     | commit `78f75304269baf4fc349f1a2b687675e71d2955e`_         |
 +-----------------+------------------------------------------------------------+
 | Credit          | Mark Horvath,                                              |
 |                 | Staff Software Engineer from Arm Ltd.                      |
@@ -71,11 +71,13 @@
 ----------
 
 Add check against the input buffer length in the ``tfm_fwu_write_ipc()`` API
-before reading the input data into the local buffer. See commit `78f7530`_.
+before reading the input data into the local buffer. See commit
+`78f75304269baf4fc349f1a2b687675e71d2955e`_.
 
-.. _3e7129f: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=3e7129f
-.. _921d0ea: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=921d0ea
-.. _78f7530: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=78f7530
+.. _3e7129f552c4cfd2973b9c17f3565df1ba45b334: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=3e7129f
+.. _921d0eaa85595e9b992de866b9da8b0d7dfe08eb: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=921d0ea
+.. _78f75304269baf4fc349f1a2b687675e71d2955e: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=78f7530
+.. _CVE-2021-43619: https://www.cve.org/CVERecord?id=CVE-2021-43619
 
 ---------------------
 
diff --git a/docs/security/security_advisories/profile_small_key_id_encoding_vulnerability.rst b/docs/security/security_advisories/profile_small_key_id_encoding_vulnerability.rst
index 1f1c8cc..37a7ea5 100644
--- a/docs/security/security_advisories/profile_small_key_id_encoding_vulnerability.rst
+++ b/docs/security/security_advisories/profile_small_key_id_encoding_vulnerability.rst
@@ -5,12 +5,12 @@
 | Title           | NSPE may access secure keys stored in TF-M Crypto service  |
 |                 | in Profile Small with Crypto key ID encoding disabled.     |
 +=================+============================================================+
-| CVE ID          | CVE-2021-40327                                             |
+| CVE ID          | `CVE-2021-40327`_                                          |
 +-----------------+------------------------------------------------------------+
 | Public          | 22nd Nov, 2021                                             |
 | Disclosure Date |                                                            |
 +-----------------+------------------------------------------------------------+
-| Versions        | TF-M v1.4.0                                                |
+| Versions        | TF-M `v1.4.0`_                                             |
 | Affected        |                                                            |
 +-----------------+------------------------------------------------------------+
 | Configurations  | Profile Small                                              |
@@ -18,7 +18,8 @@
 | Impact          | In Profile Small, secure keys stored in Crypto service can |
 |                 | be leaked to NSPE if NSPE acquires secure key IDs.         |
 +-----------------+------------------------------------------------------------+
-| Fix Version     | Commit `42e77b`_ and `v1.4.1`_                             |
+| Fix Version     | Commit `42e77b561fcfe19819ff1e63cb7c0b672ee8ba41`_ and     |
+|                 | `v1.4.1`_                                                  |
 +-----------------+------------------------------------------------------------+
 | Credit          | N/A                                                        |
 +-----------------+------------------------------------------------------------+
@@ -159,8 +160,10 @@
 
 `v1.4.1`_ fixed this issue as a patch release.
 
-.. _42e77b: https://review.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/42e77b561fcfe19819ff1e63cb7c0b672ee8ba41
+.. _42e77b561fcfe19819ff1e63cb7c0b672ee8ba41: https://review.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/42e77b561fcfe19819ff1e63cb7c0b672ee8ba41
 .. _v1.4.1: https://review.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/dd1fe44448db0f1750794cd9cf5596033f90f6f9
+.. _v1.4.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.4.0
+.. _CVE-2021-40327: https://www.cve.org/CVERecord?id=CVE-2021-40327
 
 ---------------------
 
diff --git a/docs/security/security_advisories/stack_seal_vulnerability.rst b/docs/security/security_advisories/stack_seal_vulnerability.rst
index 5019d0a..78a42d5 100644
--- a/docs/security/security_advisories/stack_seal_vulnerability.rst
+++ b/docs/security/security_advisories/stack_seal_vulnerability.rst
@@ -5,11 +5,11 @@
 | Title          | NS world may cause the CPU to perform an unexpected return  |
 |                | operation due to unsealed stacks.                           |
 +================+=============================================================+
-| CVE ID         | CVE-2020-16273                                              |
+| CVE ID         | `CVE-2020-16273`_                                           |
 +----------------+-------------------------------------------------------------+
 | Date           | 16 October 2020                                             |
 +----------------+-------------------------------------------------------------+
-| Versions       | All versions up to and including TF-M v1.1                  |
+| Versions       | All versions up to and including TF-M `v1.1`_               |
 | Affected       |                                                             |
 +----------------+-------------------------------------------------------------+
 | Configurations | All                                                         |
@@ -107,6 +107,8 @@
 .. _ARMv8-M ARM: https://developer.arm.com/documentation/ddi0553/latest
 .. _ARMv8-M Secure stack sealing advisory notice: https://developer.arm.com/support/arm-security-updates/armv8-m-stack-sealing
 .. _92e46a3abd0e328fac29ccd1cf161cd482397567: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=92e46a3abd0e328fac29ccd1cf161cd482397567
+.. _v1.1: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.1
+.. _CVE-2020-16273: https://www.cve.org/CVERecord?id=CVE-2020-16273
 
 --------------
 
diff --git a/docs/security/security_advisories/svc_caller_sp_fetching_vulnerability.rst b/docs/security/security_advisories/svc_caller_sp_fetching_vulnerability.rst
index 2b53e45..7759797 100644
--- a/docs/security/security_advisories/svc_caller_sp_fetching_vulnerability.rst
+++ b/docs/security/security_advisories/svc_caller_sp_fetching_vulnerability.rst
@@ -5,11 +5,11 @@
 | Title          | Invoking Secure functions from handler mode may cause TF-M  |
 |                | IPC model to behave unexpectedly.                           |
 +================+=============================================================+
-| CVE ID         | CVE-2021-27562                                              |
+| CVE ID         | `CVE-2021-27562`_                                           |
 +----------------+-------------------------------------------------------------+
 | Date           | Mar 5, 2021                                                 |
 +----------------+-------------------------------------------------------------+
-| Versions       | Affected All versions up to and including TF-M v1.2         |
+| Versions       | Affected All versions up to and including TF-M `v1.2`_      |
 | Affected       |                                                             |
 +----------------+-------------------------------------------------------------+
 | Configurations | IPC Model on Armv8-M                                        |
@@ -119,6 +119,8 @@
 validations performed by SPM.
 
 .. _e212ea1637a66255b44d0e7c19ebe9786ab56ccb: https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git/commit/?id=e212ea1637a66255b44d0e7c19ebe9786ab56ccb
+.. _CVE-2021-27562: https://www.cve.org/CVERecord?id=CVE-2021-27562
+.. _v1.2: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.2.0
 
 --------------
 
diff --git a/docs/security/security_advisories/user_pointers_mailbox_vectors_vulnerability.rst b/docs/security/security_advisories/user_pointers_mailbox_vectors_vulnerability.rst
index 91d0fb2..fd7d9e5 100644
--- a/docs/security/security_advisories/user_pointers_mailbox_vectors_vulnerability.rst
+++ b/docs/security/security_advisories/user_pointers_mailbox_vectors_vulnerability.rst
@@ -10,8 +10,8 @@
 | Public          | October 02, 2024                                           |
 | Disclosure Date |                                                            |
 +-----------------+------------------------------------------------------------+
-| Versions        | All version from TF-Mv1.6.0 up to TF-Mv2.1.0 inclusive     |
-| Affected        |                                                            |
+| Versions        | All version from TF-M `v1.6.0`_ up to TF-M `v2.1.0`_       |
+| Affected        | inclusive                                                  |
 +-----------------+------------------------------------------------------------+
 | Configurations  | Platforms with standard mailbox dispatcher                 |
 |                 | ``tfm_spe_mailbox``.                                       |
@@ -20,7 +20,7 @@
 |                 | in case of psa_call failure, would lead to write to a      |
 |                 | user-specified address in memory.                          |
 +-----------------+------------------------------------------------------------+
-| Fix Version     | 5ae0a02e8 TF-M v2.1.1                                      |
+| Fix Version     | `5ae0a02e847335f4e35ae6aa0b68b80280794776`_, TF-M `v2.1.1`_|
 +-----------------+------------------------------------------------------------+
 | Credit          | Infineon Technologies AG, in collaboration with: Tobias    |
 |                 | Scharnowski, Simon Wörner and Johannes Willbold from       |
@@ -62,7 +62,11 @@
 To achieve the above, proper sanitization of input data must also be performed
 and related errors propagated to the reply subroutine.
 
-.. _CVE-2024-45746: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-45746
+.. _CVE-2024-45746: https://www.cve.org/CVERecord?id=CVE-2024-45746
+.. _v1.6.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv1.6.0
+.. _v2.1.0: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv2.1.0
+.. _5ae0a02e847335f4e35ae6aa0b68b80280794776: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/5ae0a02e847335f4e35ae6aa0b68b80280794776
+.. _v2.1.1: https://git.trustedfirmware.org/plugins/gitiles/TF-M/trusted-firmware-m/+/refs/tags/TF-Mv2.1.1
 
 ---------------------