diff --git a/doc/source/developer_resources/build_guide.rst b/doc/source/developer_resources/build_guide.rst
index 36733dd58..595d89a90 100644
--- a/doc/source/developer_resources/build_guide.rst
+++ b/doc/source/developer_resources/build_guide.rst
@@ -36,7 +36,8 @@ A workstation computer with:
 * Docker
 * Android Repo Tool
 * Proxy settings configured, if required (See
-  http://lists.starlingx.io/pipermail/starlingx-discuss/2018-July/000136.html for more details)
+  https://lists.starlingx.io/archives/list/starlingx-discuss@lists.starlingx.io/message/FERKPQEAG5YOSV5T5TKEN7HPDCNXBFAL/
+  for more details)
 * Public SSH key
 
 .. _Development-environment-setup:
diff --git a/doc/source/developer_resources/debug_issues.rst b/doc/source/developer_resources/debug_issues.rst
index a5485af27..73319fc8a 100644
--- a/doc/source/developer_resources/debug_issues.rst
+++ b/doc/source/developer_resources/debug_issues.rst
@@ -119,7 +119,7 @@ Implement fixes
 Additional resources
 --------------------
 
-*   Review the `StarlingX Discuss list <http://lists.starlingx.io/pipermail/starlingx-discuss/>`_
+*   Review the `StarlingX Discuss list <https://lists.starlingx.io/archives/list/starlingx-discuss@lists.starlingx.io/>`_
     for similar questions and workarounds from the community.
 
 *   Check the `StarlingX Launchpad <https://launchpad.net/starlingx>`_ for