diff --git a/tools/gdb_panic_server.py b/tools/gdb_panic_server.py
index e93bb074ea..4b5edf26ea 100644
--- a/tools/gdb_panic_server.py
+++ b/tools/gdb_panic_server.py
@@ -60,7 +60,8 @@ GDB_REGS_INFO = {
     'esp32c3': GDB_REGS_INFO_RISCV_ILP32,
     'esp32c2': GDB_REGS_INFO_RISCV_ILP32,
     'esp32h4': GDB_REGS_INFO_RISCV_ILP32,
-    'esp32c6': GDB_REGS_INFO_RISCV_ILP32
+    'esp32c6': GDB_REGS_INFO_RISCV_ILP32,
+    'esp32h2': GDB_REGS_INFO_RISCV_ILP32
 }
 
 PanicInfo = namedtuple('PanicInfo', 'core_id regs stack_base_addr stack_data')
@@ -155,7 +156,8 @@ PANIC_OUTPUT_PARSERS = {
     'esp32c3': parse_idf_riscv_panic_output,
     'esp32c2': parse_idf_riscv_panic_output,
     'esp32h4': parse_idf_riscv_panic_output,
-    'esp32c6': parse_idf_riscv_panic_output
+    'esp32c6': parse_idf_riscv_panic_output,
+    'esp32h2': parse_idf_riscv_panic_output
 }