diff --git a/platform.json b/platform.json
index 0cb088fe0..a5583fd77 100644
--- a/platform.json
+++ b/platform.json
@@ -74,14 +74,14 @@
       "tool-xtensa-esp-elf-gdb": {
       "type": "debugger",
       "optional": true,
-      "owner": "platformio",
-      "version": "14.2.0+20240403"
+      "owner": "pioarduino",
+      "version": "https://github.com/pioarduino/registry/releases/download/0.0.1/xtensa-esp-gdb-v16.2_20250324.zip"
     },
     "tool-riscv32-esp-elf-gdb": {
       "type": "debugger",
       "optional": true,
-      "owner": "platformio",
-      "version": "14.2.0+20240403"
+      "owner": "pioarduino",
+      "version": "https://github.com/pioarduino/registry/releases/download/0.0.1/riscv32-esp-gdb-v16.2_20250324.zip"
     },
     "tool-esptoolpy": {
       "type": "uploader",
diff --git a/platform.py b/platform.py
index 96dcfe821..0b4a13b84 100644
--- a/platform.py
+++ b/platform.py
@@ -140,7 +140,7 @@ def install_tool(TOOL):
                 # Install debug tools if conditions match
                 if (variables.get("build_type") or "debug" in "".join(targets)) or variables.get("upload_protocol"):
                     for debug_tool in toolchain_data["debug_tools"]:
-                        self.packages[debug_tool]["optional"] = False
+                        install_tool(debug_tool)
                     install_tool("tool-openocd-esp32")
                 break  # Exit loop once MCU is matched