diff --git a/boards/uno_r4_wifi.json b/boards/uno_r4_wifi.json
index 592c588..82e8ac9 100644
--- a/boards/uno_r4_wifi.json
+++ b/boards/uno_r4_wifi.json
@@ -29,6 +29,9 @@
     "variant": "UNOWIFIR4"
   },
   "debug": {
+    "default_tools": [
+      "cmsis-dap"
+    ],
     "onboard_tools": [
       "cmsis-dap"
     ],
diff --git a/platform.py b/platform.py
index 0b733a6..34aec26 100644
--- a/platform.py
+++ b/platform.py
@@ -156,6 +156,13 @@ def _add_default_debug_tools(self, board):
                     ],
                 }
 
+            debug["tools"][link]["onboard"] = link in debug.get(
+                "onboard_tools", []
+            )
+            debug["tools"][link]["default"] = link in debug.get(
+                "default_tools", []
+            )
+
         board.manifest["debug"] = debug
         return board