diff --git a/doc/getting_started/installation_win.rst b/doc/getting_started/installation_win.rst
index c961b6ed750..2bf569d52c1 100644
--- a/doc/getting_started/installation_win.rst
+++ b/doc/getting_started/installation_win.rst
@@ -16,7 +16,7 @@ command-prompt. This allows you to use software such as the :ref:`Zephyr SDK
 .. warning::
       Windows 10 version 1803 has an issue that will cause CMake to not work
       properly and is fixed in version 1809 (and later).
-      More information can be found in `Zephyr Issue 10420`_
+      More information can be found in :github:`Zephyr Issue 10420 <10420>`.
 
 #. `Install the Windows Subsystem for Linux (WSL)`_.
 
@@ -33,4 +33,3 @@ command-prompt. This allows you to use software such as the :ref:`Zephyr SDK
    the documentation itself here.
 
 .. _Install the Windows Subsystem for Linux (WSL): https://msdn.microsoft.com/en-us/commandline/wsl/install_guide
-.. _Zephyr Issue 10420: :github:`10420`
diff --git a/doc/guides/west/why.rst b/doc/guides/west/why.rst
index 87220b6b7b9..628d557592e 100644
--- a/doc/guides/west/why.rst
+++ b/doc/guides/west/why.rst
@@ -117,7 +117,4 @@ West is:
   interoperability with third party tools, and means Zephyr developers
   can always find out what is happening "under the hood" when using west.
 
-See `Zephyr issue #6205`_ and for more details and discussion.
-
-.. _Zephyr issue #6205:
-   :github:`6205`
+See :github:`Zephyr issue #6205 <6205>` and for more details and discussion.