diff --git a/docs/conf.py b/docs/conf.py
index ccbe37a..3d4b4c4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,7 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'Trusted Firmware-M Tests'
+project = 'Trusted Firmware-M Tools'
 copyright = '2023, ARM CE-OSS'
 author = 'ARM CE-OSS'
 title = 'User Guide'
@@ -50,8 +50,17 @@
     'sphinxcontrib.plantuml', #Add support for PlantUML drawings
     'sphinxcontrib.rsvgconverter', #Add support for SVG to PDF
     'sphinx_tabs.tabs', #Enable tab extension in Sphinx
+    'sphinx.ext.intersphinx', #Enable Intersphinx
 ]
 
+intersphinx_mapping = {
+    "TF-M-Tests": ("https://trustedfirmware-m.readthedocs.io/projects/tf-m-tests/en/latest/", None),
+    "TF-M": ("https://trustedfirmware-m.readthedocs.io/en/latest/", None),
+    "TF-M-Extras": ("https://trustedfirmware-m.readthedocs.io/projects/tf-m-extras/en/latest/", None),
+}
+
+intersphinx_disabled_reftypes = ["*"]
+
 # Make auto section labels generated be prefixed with file name.
 autosectionlabel_prefix_document=True
 # Add auto section label for level 2 headers only.
diff --git a/docs/index.rst b/docs/index.rst
index 874c78a..a4b0190 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,7 +6,7 @@
 
 .. toctree::
   :caption: Overview
-  :maxdepth: 1
+  :titlesonly:
 
   CMSIS TF-M Packs <cmsis_pack>
   Code Size Analyze Tool <code-size-analyze-tool>
@@ -26,6 +26,8 @@
   :hidden:
 
   Trusted Firmware-M <https://trustedfirmware-m.readthedocs.io/en/latest/>
+  TF-M Tests <https://trustedfirmware-m.readthedocs.io/projects/tf-m-tests/en/latest/>
+  TF-M Extras <https://trustedfirmware-m.readthedocs.io/projects/tf-m-extras/en/latest/>
 
 --------------