diff --git a/docs/contributing/contributing_process.rst b/docs/contributing/contributing_process.rst
index 95afef0..fb2379b 100644
--- a/docs/contributing/contributing_process.rst
+++ b/docs/contributing/contributing_process.rst
@@ -8,9 +8,9 @@
    Please contact :doc:`maintainers </contributing/maintainers>` for any
    questions.
 
-- Subscribe to `TF-M development
-  <https://lists.trustedfirmware.org/mailman/listinfo/tf-m>`_ if not subscribed
-  already.
+- Subscribe to `TF-M development mailing list
+  <https://lists.trustedfirmware.org/mailman3/lists/tf-m.lists.trustedfirmware.org>`_
+  if not subscribed already.
 - Refer to the `Roadmap
   <https://developer.trustedfirmware.org/w/tf_m/planning>`_ or send a mail to
   the tf-m@lists.trustedfirmware.org to check if this work is already
diff --git a/docs/contributing/maintainers.rst b/docs/contributing/maintainers.rst
index c013a20..0d2841b 100644
--- a/docs/contributing/maintainers.rst
+++ b/docs/contributing/maintainers.rst
@@ -36,7 +36,7 @@
 
 Tamas Ban
     :email: `Tamas.Ban@arm.com <Tamas.Ban@arm.com>`__
-    :github: `tamban01 <https://github.com/tamban01>`__
+    :github: `tamasban <https://github.com/tamasban>`__
 
 Sherry Zhang
     :email: `Sherry.Zhang2@arm.com <Sherry.Zhang2@arm.com>`__
diff --git a/docs/index.rst b/docs/index.rst
index 294e94b..c606c79 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -43,7 +43,7 @@
             <p>Guidelines for integration with TF-M.</p>
         </li>
         <li class="grid-item">
-            <a href="technical_references/index.html">
+            <a href="technical_references/design_docs/index.html">
                 <img alt="" src="_static/images/tfm-reference.png"/>
                 <h2>References</h2>
             </a>
diff --git a/docs/integration_guide/services/tfm_secure_partition_addition.rst b/docs/integration_guide/services/tfm_secure_partition_addition.rst
index 4df1b1f..d5ba6f5 100644
--- a/docs/integration_guide/services/tfm_secure_partition_addition.rst
+++ b/docs/integration_guide/services/tfm_secure_partition_addition.rst
@@ -722,8 +722,8 @@
 | `PSA Firmware Framework specification`_
 | `Firmware Framework for M 1.1 Extensions`_
 
-.. _PSA Firmware Framework specification: https://pages.arm.com/psa-
-  resources-ff.html?_ga=2.156169596.61580709.1542617040-1290528876.1541647333
+.. _PSA Firmware Framework specification:
+  https://www.arm.com/architecture/security-features/platform-security
 
 .. _Firmware Framework for M 1.1 Extensions: https://developer.arm.com/
   documentation/aes0039/latest
diff --git a/docs/technical_references/design_docs/ff_isolation.rst b/docs/technical_references/design_docs/ff_isolation.rst
index daa8b48..cdc98d1 100644
--- a/docs/technical_references/design_docs/ff_isolation.rst
+++ b/docs/technical_references/design_docs/ff_isolation.rst
@@ -390,11 +390,13 @@
 ========
 | `PSA Firmware_Framework for M`_
 
-.. _PSA Firmware_Framework for M: https://pages.arm.com/psa-resources-ff.html
+.. _PSA Firmware_Framework for M:
+  https://www.arm.com/architecture/security-features/platform-security
 
 | `Trusted Base System Architecture for Armv6-M, Armv7-M and Armv8-M`_
 
-.. _Trusted Base System Architecture for Armv6-M, Armv7-M and Armv8-M: https://pages.arm.com/psa-resources-tbsa-m.html
+.. _Trusted Base System Architecture for Armv6-M, Armv7-M and Armv8-M:
+   https://www.arm.com/architecture/security-features/platform-security
 
 --------------
 
diff --git a/docs/technical_references/design_docs/tfm_psa_inter_process_communication.rst b/docs/technical_references/design_docs/tfm_psa_inter_process_communication.rst
index 757bba3..4107666 100644
--- a/docs/technical_references/design_docs/tfm_psa_inter_process_communication.rst
+++ b/docs/technical_references/design_docs/tfm_psa_inter_process_communication.rst
@@ -222,8 +222,8 @@
 | `Slides includes IPC basic introduction URL`_
 | `IPC model implementation URL`_
 
-.. _PSA Firmware Framework specification URL: https://pages.arm.com/psa-
-  resources-ff.html?_ga=2.156169596.61580709.1542617040-1290528876.1541647333
+.. _PSA Firmware Framework specification URL:
+  https://www.arm.com/architecture/security-features/platform-security
 .. _Slides includes IPC basic introduction URL: https://connect.linaro.org/
   resources/yvr18/sessions/yvr18-108/
 .. _IPC model implementation URL: https://www.youtube.com/watch?v=6wEFoq49qUw