diff --git a/boards/blues_cygnet.json b/boards/blues_cygnet.json
index a14ef5ba..b879a7e0 100644
--- a/boards/blues_cygnet.json
+++ b/boards/blues_cygnet.json
@@ -1,10 +1,14 @@
 {
     "build": {
+      "arduino": {
+        "variant_h": "variant_CYGNET.h"
+      },
+      "core": "stm32",
       "cpu": "cortex-m4",
-      "extra_flags": "-DSTM32L4 -DSTM32L433xx",
+      "extra_flags": "-DARDUINO_CYGNET -DSTM32L4 -DSTM32L4xx -DSTM32L433xx",
       "f_cpu": "80000000L",
       "framework_extra_flags": {
-        "arduino": "-DCUSTOM_PERIPHERAL_PINS -DARDUINO_CYGNET -DPIO_FRAMEWORK_ARDUINO_ENABLE_CDC"
+        "arduino": "-DCUSTOM_PERIPHERAL_PINS -DPIO_FRAMEWORK_ARDUINO_ENABLE_CDC"
       },
       "mcu": "stm32l433cct6",
       "product_line": "STM32L433xx",
@@ -31,13 +35,13 @@
     "upload": {
       "maximum_ram_size": 65536,
       "maximum_size": 262144,
-      "protocol": "dfu",
+      "protocol": "stlink",
       "protocols": [
         "dfu",
-        "jlink",
+        "blackmagic",
         "cmsis-dap",
+        "jlink",
         "stlink",
-        "blackmagic",
         "mbed"
       ]
     },
diff --git a/boards/blues_swan_r5.json b/boards/blues_swan_r5.json
index fda601ed..83dd65ef 100644
--- a/boards/blues_swan_r5.json
+++ b/boards/blues_swan_r5.json
@@ -8,7 +8,7 @@
     "extra_flags": "-DARDUINO_SWAN_R5 -DSTM32L4 -DSTM32L4xx -DSTM32L4R5xx",
     "f_cpu": "120000000L",
     "framework_extra_flags": {
-      "arduino": "-DCUSTOM_PERIPHERAL_PINS"
+      "arduino": "-DCUSTOM_PERIPHERAL_PINS -DPIO_FRAMEWORK_ARDUINO_ENABLE_CDC"
     },
     "mcu": "stm32l4r5ziy6",
     "product_line": "STM32L4R5xx",
@@ -18,13 +18,18 @@
     "can"
   ],
   "debug": {
+    "default_tools": [
+      "stlink"
+    ],
     "jlink_device": "STM32L4R5ZI",
     "openocd_target": "stm32l4x",
     "svd_path": "STM32L4R5.svd"
   },
   "frameworks": [
     "arduino",
-    "stm32cube"
+    "cmsis",
+    "stm32cube",
+    "libopencm3"
   ],
   "name": "Blues Swan R5",
   "upload": {
@@ -41,6 +46,6 @@
       "mbed"
     ]
   },
-  "url": "https://blues.io/products/swan",
+  "url": "https://blues.com/products/swan/",
   "vendor": "Blues"
 }