diff --git a/targets/esp32c3.json b/targets/esp32c3.json
index bb700035..9c2fc64f 100644
--- a/targets/esp32c3.json
+++ b/targets/esp32c3.json
@@ -11,6 +11,10 @@
 		"src/device/esp/esp32c3.S"
 	],
 	"binary-format": "esp32c3",
-	"flash-command": "esptool.py --chip=esp32c3 --port {port} write_flash 0x0 {bin}"
+	"flash-command": "esptool.py --chip=esp32c3 --port {port} write_flash 0x0 {bin}",
+	"serial-port": ["acm:303a:1001"],
+	"openocd-interface": "esp_usb_jtag",
+	"openocd-target": "esp32c3",
+	"openocd-commands": ["gdb_memory_map disable"]
 }
 
diff --git a/targets/riscv32.json b/targets/riscv32.json
index 728fc3cc..0eeaa1cf 100644
--- a/targets/riscv32.json
+++ b/targets/riscv32.json
@@ -8,5 +8,6 @@
 	],
 	"ldflags": [
 		"-melf32lriscv"
-	]
+	],
+	"gdb": ["gdb-multiarch"]
 }