diff --git a/docs b/docs
index 4522803c..2175b369 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 4522803cd65aef6c74df9c03f53c2a2e76922402
+Subproject commit 2175b369e206d000e1cca1f14ba2d309b358790a
diff --git a/examples b/examples
index 7fbb0ec1..f98cb5a9 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit 7fbb0ec1532e98af213ffd242d725a8cde1061f8
+Subproject commit f98cb5a9be74b9c87b6e5f3cd530d8d7f0548825
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index 2846c7da..a9a96c7b 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -39,6 +39,8 @@ RST_COPYRIGHT = """..  Copyright (c) 2014-present PlatformIO <contact@platformio
     limitations under the License.
 """
 
+SKIP_DEBUG_TOOLS = ["esp-bridge", "esp-builtin"]
+
 DOCS_ROOT_DIR = os.path.realpath(
     os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", "docs")
 )
@@ -904,10 +906,12 @@ You can switch between debugging :ref:`debugging_tools` using
         )
         for (tool_name, tool_data) in sorted(board["debug"]["tools"].items()):
             lines.append(
-                """  * - :ref:`debugging_tool_{name}`
+                """  * - {tool}
     - {onboard}
     - {default}""".format(
-                    name=tool_name,
+                    tool=f"``{tool_name}``"
+                    if tool_name in SKIP_DEBUG_TOOLS
+                    else f":ref:`debugging_tool_{tool_name}`",
                     onboard="Yes" if tool_data.get("onboard") else "",
                     default="Yes" if tool_name == default_debug_tool else "",
                 )
@@ -984,7 +988,10 @@ Boards
     for tool, platforms in tool_to_platforms.items():
         tool_path = os.path.join(DOCS_ROOT_DIR, "plus", "debug-tools", "%s.rst" % tool)
         if not os.path.isfile(tool_path):
-            click.secho("Unknown debug tool `%s`" % tool, fg="red")
+            if tool in SKIP_DEBUG_TOOLS:
+                click.secho("Skipped debug tool `%s`" % tool, fg="yellow")
+            else:
+                click.secho("Unknown debug tool `%s`" % tool, fg="red")
             continue
         platforms = sorted(set(platforms))