diff --git a/doc/conf.py b/doc/conf.py
index dd70d72d434c..a6aee7175204 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -253,8 +253,8 @@
 # -- Linkcheck options ----------------------------------------------------
 
 extlinks = {
-    "jira": ("https://jira.zephyrproject.org/browse/%s", ""),
-    "github": ("https://github.com/zephyrproject-rtos/zephyr/issues/%s", ""),
+    "jira": ("https://jira.zephyrproject.org/browse/%s", "JIRA %s"),
+    "github": ("https://github.com/zephyrproject-rtos/zephyr/issues/%s", "GitHub #%s"),
 }
 
 linkcheck_timeout = 30
diff --git a/scripts/requirements-doc.txt b/scripts/requirements-doc.txt
index 650f55527cec..06ed83896e59 100644
--- a/scripts/requirements-doc.txt
+++ b/scripts/requirements-doc.txt
@@ -1,7 +1,7 @@
 # DOC: used to generate docs
 
 breathe>=4.30
-sphinx~=4.0
+sphinx~=5.0.2
 sphinx_rtd_theme~=1.0
 sphinx-tabs
 sphinxcontrib-svg2pdfconverter