diff --git a/docs/faq/index.rst b/docs/faq/index.rst
--- a/docs/faq/index.rst
+++ b/docs/faq/index.rst
@@ -3,6 +3,11 @@
 Frequently Asked Questions
 **************************
 
+.. contents::
+   :depth: 3
+   :local:
+..
+
 .. _faq_prerequisites:
 
 Prerequisites for code contributions
diff --git a/docs/index.rst b/docs/index.rst
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -52,10 +52,15 @@
 Frequently Asked Questions
 --------------------------
 
-.. toctree::
-   :maxdepth: 2
-
-   faq/index
+* :ref:`faq_prerequisites`
+* :ref:`faq_getting_started`
+* :ref:`faq_run_swh`
+* :ref:`faq_dataset`
+* :ref:`faq_error_bugs`
+* :ref:`faq_legal`
+* :ref:`faq_code_review`
+* :ref:`faq_api`
+* :ref:`faq_sysadm`
 
 Roadmap
 -------
diff --git a/user/faq/index.rst b/user/faq/index.rst
--- a/user/faq/index.rst
+++ b/user/faq/index.rst
@@ -3,6 +3,11 @@
 Frequently Asked Questions
 **************************
 
+.. contents::
+   :depth: 3
+   :local:
+..
+
 .. _faq_roadmap:
 
 Roadmap
diff --git a/user/index.rst b/user/index.rst
--- a/user/index.rst
+++ b/user/index.rst
@@ -21,10 +21,9 @@
 Frequently Asked Questions
 ---------------------------
 
-.. toctree::
-   :maxdepth: 2
-
-   faq/index
+* :ref:`faq_roadmap`
+* :ref:`faq_savecodenow`
+* :ref:`faq_search`
 
 
 Indices and tables