diff --git a/boards/portenta_c33.json b/boards/portenta_c33.json
index 3acccce..75eee07 100644
--- a/boards/portenta_c33.json
+++ b/boards/portenta_c33.json
@@ -26,7 +26,7 @@
     "variant": "PORTENTA_C33"
   },
   "debug": {
-    "jlink_device": "R7FA6M5",
+    "jlink_device": "R7FA6M5BH",
     "svd_path": "R7FA6M5BH.svd"
   },
   "frameworks": [
diff --git a/boards/uno_r4_minima.json b/boards/uno_r4_minima.json
index 45df704..1e7eefa 100644
--- a/boards/uno_r4_minima.json
+++ b/boards/uno_r4_minima.json
@@ -26,7 +26,7 @@
     "variant": "MINIMA"
   },
   "debug": {
-    "jlink_device": "ra4m1",
+    "jlink_device": "R7FA4M1AB",
     "svd_path": "R7FA4M1AB.svd"
   },
   "frameworks": [
diff --git a/boards/uno_r4_wifi.json b/boards/uno_r4_wifi.json
index d425799..592c588 100644
--- a/boards/uno_r4_wifi.json
+++ b/boards/uno_r4_wifi.json
@@ -32,7 +32,7 @@
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "jlink_device": "ra4m1",
+    "jlink_device": "R7FA4M1AB",
     "openocd_config": "openocd.cfg",
     "svd_path": "R7FA4M1AB.svd"
   },