diff --git a/boards/adi/max32657evkit/doc/index.rst b/boards/adi/max32657evkit/doc/index.rst
index ded0c6c239bc0..cd7e4336e114b 100644
--- a/boards/adi/max32657evkit/doc/index.rst
+++ b/boards/adi/max32657evkit/doc/index.rst
@@ -572,4 +572,4 @@ References
    https://developer.arm.com/documentation/100935/0100/The-TrustZone-hardware-architecture-
 
 .. _Trusted Firmware M:
-   https://tf-m-user-guide.trustedfirmware.org/building/tfm_build_instruction.html
+   https://tf-m.docs.trustedfirmware.org/en/latest/building/tfm_build_instruction.html
diff --git a/boards/arm/mps2/doc/mps2_an521.rst b/boards/arm/mps2/doc/mps2_an521.rst
index 067b4f286b0fe..35a0820841d46 100644
--- a/boards/arm/mps2/doc/mps2_an521.rst
+++ b/boards/arm/mps2/doc/mps2_an521.rst
@@ -562,7 +562,7 @@ serial port:
    https://developer.arm.com/documentation/100235/latest/
 
 .. _Trusted Firmware M:
-   https://tf-m-user-guide.trustedfirmware.org/building/tfm_build_instruction.html
+   https://tf-m.docs.trustedfirmware.org/en/latest/building/tfm_build_instruction.html
 
 .. _Corelink SSE-200 Subsystem:
    https://developer.arm.com/documentation/dto0051/latest/subsystem-overview/about-the-sse-200
diff --git a/boards/arm/v2m_musca_b1/doc/index.rst b/boards/arm/v2m_musca_b1/doc/index.rst
index cb9aa61a0fdba..93a56df93409e 100644
--- a/boards/arm/v2m_musca_b1/doc/index.rst
+++ b/boards/arm/v2m_musca_b1/doc/index.rst
@@ -393,7 +393,7 @@ serial port:
    https://developer.arm.com/documentation/100235/latest/
 
 .. _Trusted Firmware M Guide:
-   https://tf-m-user-guide.trustedfirmware.org/building/tfm_build_instruction.html
+   https://tf-m.docs.trustedfirmware.org/en/latest/building/tfm_build_instruction.html
 
 .. _Corelink SSE-200 Subsystem:
    https://developer.arm.com/documentation/dto0051/latest/subsystem-overview/about-the-sse-200
diff --git a/boards/arm/v2m_musca_s1/doc/index.rst b/boards/arm/v2m_musca_s1/doc/index.rst
index 86806891295eb..bbcd1ba9b7ebf 100644
--- a/boards/arm/v2m_musca_s1/doc/index.rst
+++ b/boards/arm/v2m_musca_s1/doc/index.rst
@@ -421,7 +421,7 @@ corresponding TF-M integration example's README file.
    https://developer.arm.com/documentation/100235/latest/
 
 .. _Trusted Firmware-M Guide:
-   https://tf-m-user-guide.trustedfirmware.org/building/tfm_build_instruction.html
+   https://tf-m.docs.trustedfirmware.org/en/latest/building/tfm_build_instruction.html
 
 .. _Corelink SSE-200 Subsystem:
    https://developer.arm.com/documentation/dto0051/latest/subsystem-overview/about-the-sse-200
diff --git a/doc/services/tfm/overview.rst b/doc/services/tfm/overview.rst
index 287c7fef43188..8cd6519bf586c 100644
--- a/doc/services/tfm/overview.rst
+++ b/doc/services/tfm/overview.rst
@@ -1,7 +1,7 @@
 Trusted Firmware-M Overview
 ###########################
 
-`Trusted Firmware-M (TF-M) <https://tf-m-user-guide.trustedfirmware.org/>`__
+`Trusted Firmware-M (TF-M) <https://tf-m.docs.trustedfirmware.org/en/latest/>`__
 is a reference implementation of the Platform Security Architecture (PSA)
 `IoT Security Framework <https://www.psacertified.org/what-is-psa-certified/>`__.
 It defines and implements an architecture and a set of software components
@@ -210,7 +210,7 @@ As of TF-M 1.8.0, the following secure services are generally available (althoug
 A template also exists for creating your own custom services.
 
 For full details on these services, and their exposed APIs, please consult the
-`TF-M Documentation <https://tf-m-user-guide.trustedfirmware.org/>`__.
+`TF-M Documentation <https://tf-m.docs.trustedfirmware.org/en/latest/>`__.
 
 Key Management and Derivation
 -----------------------------
diff --git a/samples/tfm_integration/tfm_integration.rst b/samples/tfm_integration/tfm_integration.rst
index a445c38cfb213..3959d6a9b86e2 100644
--- a/samples/tfm_integration/tfm_integration.rst
+++ b/samples/tfm_integration/tfm_integration.rst
@@ -43,4 +43,4 @@ convenience sake at
 For further information consult the official `TF-M documentation`_
 
 .. _TF-M documentation:
-   https://tf-m-user-guide.trustedfirmware.org/
+   https://tf-m.docs.trustedfirmware.org/en/latest/
diff --git a/samples/tfm_integration/tfm_secure_partition/README.rst b/samples/tfm_integration/tfm_secure_partition/README.rst
index 8150fead862a5..1108856323cf9 100644
--- a/samples/tfm_integration/tfm_secure_partition/README.rst
+++ b/samples/tfm_integration/tfm_secure_partition/README.rst
@@ -23,7 +23,7 @@ build files and build configuration files. The partition is built by the TF-M bu
 :ref:`tfm_build_system` for more details.
 
 For more information on how to add custom secure partitions refer to TF-M's guide:
-https://tf-m-user-guide.trustedfirmware.org/integration_guide/services/tfm_secure_partition_addition.html
+https://tf-m.docs.trustedfirmware.org/en/latest/integration_guide/services/tfm_secure_partition_addition.html
 
 When adapting this partition for your own purposes, please change all occurrences of
 "dummy_partition", "DUMMY_PARTITION", "dp", and "DP" to your own partition name. Also, look through