diff --git a/targets/arduino-mkrwifi1010.json b/targets/arduino-mkrwifi1010.json
index c1c69583..225d29be 100644
--- a/targets/arduino-mkrwifi1010.json
+++ b/targets/arduino-mkrwifi1010.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd21g18a"],
-    "build-tags": ["arduino_mkrwifi1010"],
+    "build-tags": ["arduino_mkrwifi1010", "ninafw"],
     "serial": "usb",
     "serial-port": ["2341:8054", "2341:0054"],
     "flash-command": "bossac -i -e -w -v -R -U --port={port} --offset=0x2000 {bin}",
diff --git a/targets/matrixportal-m4.json b/targets/matrixportal-m4.json
index 7a7156f0..c1f27a4a 100644
--- a/targets/matrixportal-m4.json
+++ b/targets/matrixportal-m4.json
@@ -1,6 +1,6 @@
 {
     "inherits": ["atsamd51j19a"],
-    "build-tags": ["matrixportal_m4"],
+    "build-tags": ["matrixportal_m4", "ninafw"],
     "serial": "usb",
     "serial-port": ["239a:80c9", "239a:80ca"],
     "flash-1200-bps-reset": "true",