diff --git a/tools/tools.json b/tools/tools.json
index 4b1c085d083d..b836a0bd34ea 100644
--- a/tools/tools.json
+++ b/tools/tools.json
@@ -89,7 +89,11 @@
       "license": "GPL-3.0-or-later",
       "name": "riscv32-esp-elf-gdb",
       "supported_targets": [
-        "esp32c3"
+        "esp32c3",
+        "esp32c2",
+        "esp32c6",
+        "esp32h2",
+        "esp32h4"
       ],
       "version_cmd": [
         "riscv32-esp-elf-gdb-no-python",