diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
index 54c5bff6a0..143910318d 100644
--- a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8015
+USB_PID = 0x80D3
 USB_PRODUCT = "Feather M0 Adalogger"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
index d5e03b49d4..345722575a 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8023
+USB_PID = 0x80D1
 USB_PRODUCT = "Feather M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
index 7556b9517f..30701f7286 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8015
+USB_PID = 0x80D2
 USB_PRODUCT = "Feather M0 RFM69"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
index de79638bd3..2d8010a360 100644
--- a/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8015
+USB_PID = 0x80D4
 USB_PRODUCT = "Feather M0 RFM9x"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk b/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk
index e9d94638af..ef571f9ab4 100755
--- a/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x8023
+USB_PID = 0x80D0
 USB_PRODUCT = "Feather RadioFruit Zigbee"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
diff --git a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
index 7305abf73a..1cc91a8df6 100644
--- a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x801D
+USB_PID = 0x80D5
 USB_PRODUCT = "PewPew 10.2"
 USB_MANUFACTURER = "Radomir Dopieralski"
 
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index 1c43369076..f34655a959 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x801F
+USB_PID = 0x80AF
 USB_PRODUCT = "uGame10"
 USB_MANUFACTURER = "Radomir Dopieralski"
 
diff --git a/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk b/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk
index 08915a19b9..4f5899fa7d 100644
--- a/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk
+++ b/ports/nrf/boards/TG-Watch02A/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x802A
+USB_PID = 0x80DB
 USB_PRODUCT = "TG-Watch02A"
 USB_MANUFACTURER = "TG-Tech"
 
diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
index f30b308ecf..30946057c9 100644
--- a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
+++ b/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x803C
+USB_PID = 0x80D7
 USB_PRODUCT = "Blip"
 USB_MANUFACTURER = "Electronut Labs"
 
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
index 3395750496..d69bc82357 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x802A
+USB_PID = 0x80DC
 USB_PRODUCT = "nRF52840-MDK"
 USB_MANUFACTURER = "makerdiary"
 
diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
index 55ca410d9f..c4fa121744 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
+++ b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x802A
+USB_PID = 0x80DD
 USB_PRODUCT = "nRF52840-MDK-Dongle"
 USB_MANUFACTURER = "makerdiary"
 
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index 8fd1ef08d0..f24e6f6670 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x802A
+USB_PID = 0x80DA
 USB_PRODUCT = "PCA10056"
 USB_MANUFACTURER = "Nordic Semiconductor"
 
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/pca10059/mpconfigboard.mk
index 3f97b08218..9dc3cc71ed 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10059/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x802A
+USB_PID = 0x80D9
 USB_PRODUCT = "PCA10059"
 USB_MANUFACTURER = "Nordic Semiconductor"
 
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
index 715b65e63e..fcac550996 100644
--- a/ports/nrf/boards/pca10100/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x802A
+USB_PID = 0x80D8
 USB_PRODUCT = "PCA10100"
 USB_MANUFACTURER = "Nordic Semiconductor"
 
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index cf60c89c26..69a6c65c85 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x805A
+USB_PID = 0x80CF
 USB_PRODUCT = "Meowbit"
 USB_MANUFACTURER = "Kittenbot"
 USB_DEVICES = "CDC,MSC"
diff --git a/ports/stm/boards/thunderpack/mpconfigboard.mk b/ports/stm/boards/thunderpack/mpconfigboard.mk
index 007b00cdd1..02f28775ae 100644
--- a/ports/stm/boards/thunderpack/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x806A
+USB_PID = 0x8069
 USB_PRODUCT = "Thunderpack STM32F411"
 USB_MANUFACTURER = "Jeremy Gillick"
 USB_DEVICES = "CDC,MSC"
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
index b05d56012f..dd6bf56709 100644
--- a/tools/ci_check_duplicate_usb_vid_pid.py
+++ b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -38,7 +38,13 @@ DEFAULT_IGNORELIST = [
     "pygamer",
     "pygamer_advance",
     "trinket_m0",
-    "trinket_m0_haxpress"
+    "trinket_m0_haxpress",
+    "sparkfun_qwiic_micro_with_flash",
+    "sparkfun_qwiic_micro_no_flash",
+    "feather_m0_express",
+    "feather_m0_supersized",
+    "cp32-m4",
+    "metro_m4_express"
 ]
 
 cli_parser = argparse.ArgumentParser(description="USB VID/PID Duplicate Checker")
@@ -118,9 +124,13 @@ def check_vid_pid(files, ignorelist):
                 )
 
         duplicate_message = (
-            f"Duplicate VID/PID usage found!\n{duplicates}"
+            f"Duplicate VID/PID usage found!\n{duplicates}\n"
+            f"If you are open source maker, then you can request a PID from http://pid.codes\n"
+            f"Otherwise, companies should pay the USB-IF for a vendor ID: https://www.usb.org/getting-vendor-id"
         )
         sys.exit(duplicate_message)
+    else:
+        print("No USB PID duplicates found.")
 
 
 if __name__ == "__main__":