diff --git a/docs/GenerateChipDeviceCtrlDoc.sh b/docs/GenerateChipDeviceCtrlDoc.sh
index 6a3b859c63105d..556186a2bb4781 100755
--- a/docs/GenerateChipDeviceCtrlDoc.sh
+++ b/docs/GenerateChipDeviceCtrlDoc.sh
@@ -25,6 +25,7 @@ pydoc-markdown -m chip.ChipDeviceCtrl '{
       descriptive_class_title: false,
       render_toc: true,
       render_toc_title: "ChipDeviceCtrl.py API",
-      insert_header_anchors: true
+      insert_header_anchors: true,
+      add_full_prefix: true,
     }
   }' >"$1"/ChipDeviceCtrlAPI.md
diff --git a/docs/Makefile b/docs/Makefile
index abd00755dc3371..bbab653cd14409 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -7,7 +7,7 @@ SPHINXOPTS    ?= -W -T --keep-going -c . -d _build/doctrees
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = _build/src
 BUILDDIR      = _build
-PYTHON_API_DIR= ${BUILDDIR}/testing
+PYTHON_API_DIR= ${SOURCEDIR}/testing
 
 # Put it first so that "make" without argument is like "make help".
 help:
diff --git a/docs/conf.py b/docs/conf.py
index 52402d86518b80..d13e1c23fb28c3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,7 +12,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "Matter"
-copyright = "2020-2023, Matter Contributors"
+copyright = "2020-2024, Matter Contributors"
 author = "Matter Contributors"
 version = "1.0.0"
 
@@ -83,3 +83,5 @@
     "data_model/",
 ]
 external_content_link_extensions = [".md", ".png", ".jpg", ".svg"]
+
+external_content_keep = ['**/ChipDeviceCtrlAPI.md']