diff --git a/boards/waveshare_rp2040_lcd_0_96.json b/boards/waveshare_rp2040_lcd_0_96.json
index 10bcac4..75e6d87 100644
--- a/boards/waveshare_rp2040_lcd_0_96.json
+++ b/boards/waveshare_rp2040_lcd_0_96.json
@@ -22,7 +22,7 @@
             ]
         ],
         "mcu": "rp2040",
-        "variant": "waveshare_rp2040_lcd_0_96"
+        "variant": "waveshare_rp2040_lcd_0.96"
     },
     "debug": {
         "jlink_device": "RP2040_M0_0",
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-lcd-0.96.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_lcd_1_28.json b/boards/waveshare_rp2040_lcd_1_28.json
index 2025b1b..a35375e 100644
--- a/boards/waveshare_rp2040_lcd_1_28.json
+++ b/boards/waveshare_rp2040_lcd_1_28.json
@@ -22,7 +22,7 @@
             ]
         ],
         "mcu": "rp2040",
-        "variant": "waveshare_rp2040_lcd_1_28"
+        "variant": "waveshare_rp2040_lcd_1.28"
     },
     "debug": {
         "jlink_device": "RP2040_M0_0",
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-lcd-1.28.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_matrix.json b/boards/waveshare_rp2040_matrix.json
index 1954968..b0feec0 100644
--- a/boards/waveshare_rp2040_matrix.json
+++ b/boards/waveshare_rp2040_matrix.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-matrix.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_one.json b/boards/waveshare_rp2040_one.json
index a0a5806..df19f75 100644
--- a/boards/waveshare_rp2040_one.json
+++ b/boards/waveshare_rp2040_one.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-one.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_pizero.json b/boards/waveshare_rp2040_pizero.json
index b984dd2..128abe0 100644
--- a/boards/waveshare_rp2040_pizero.json
+++ b/boards/waveshare_rp2040_pizero.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-pizero.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_plus.json b/boards/waveshare_rp2040_plus.json
index 3989701..169a0f0 100644
--- a/boards/waveshare_rp2040_plus.json
+++ b/boards/waveshare_rp2040_plus.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-plus.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_plus_16mb.json b/boards/waveshare_rp2040_plus_16mb.json
index 037f9bf..7fffed9 100644
--- a/boards/waveshare_rp2040_plus_16mb.json
+++ b/boards/waveshare_rp2040_plus_16mb.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-plus.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_plus_4mb.json b/boards/waveshare_rp2040_plus_4mb.json
index 5addd95..837462e 100644
--- a/boards/waveshare_rp2040_plus_4mb.json
+++ b/boards/waveshare_rp2040_plus_4mb.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-plus.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2040_zero.json b/boards/waveshare_rp2040_zero.json
index f211f85..bc94bc5 100644
--- a/boards/waveshare_rp2040_zero.json
+++ b/boards/waveshare_rp2040_zero.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2040-zero.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2350_lcd_0_96.json b/boards/waveshare_rp2350_lcd_0_96.json
index adf8adc..3f2d666 100644
--- a/boards/waveshare_rp2350_lcd_0_96.json
+++ b/boards/waveshare_rp2350_lcd_0_96.json
@@ -22,7 +22,7 @@
             ]
         ],
         "mcu": "rp2350",
-        "variant": "waveshare_rp2350_lcd_0_96"
+        "variant": "waveshare_rp2350_lcd_0.96"
     },
     "debug": {
         "jlink_device": "RP2350_M33_0",
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2350-lcd-0.96.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2350_plus.json b/boards/waveshare_rp2350_plus.json
index 710fe5b..2b6b1e9 100644
--- a/boards/waveshare_rp2350_plus.json
+++ b/boards/waveshare_rp2350_plus.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2350-plus.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}
diff --git a/boards/waveshare_rp2350_zero.json b/boards/waveshare_rp2350_zero.json
index fd853bd..1e506a6 100644
--- a/boards/waveshare_rp2350_zero.json
+++ b/boards/waveshare_rp2350_zero.json
@@ -51,6 +51,6 @@
             "picoprobe"
         ]
     },
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.waveshare.com/rp2350-zero.htm",
     "vendor": "Waveshare"
-}
\ No newline at end of file
+}