diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
index bc3a6e77bb..8747396306 100644
--- a/.github/workflows/micropython.yml
+++ b/.github/workflows/micropython.yml
@@ -7,8 +7,8 @@ on:
     types: [created]
 
 env:
-  MICROPYTHON_VERSION: v1.25.0
-  MICROPYTHON_FLAVOUR: micropython
+  MICROPYTHON_FLAVOUR: pimoroni
+  MICROPYTHON_VERSION: feature/multi-msc
 
 jobs:
   build:
diff --git a/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.h b/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.h
index 1140d377a4..dc624b8f36 100644
--- a/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.h
+++ b/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.h
@@ -3,6 +3,11 @@
 #define MICROPY_HW_BOARD_NAME          "Pimoroni Tufty 2040"
 #define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
 
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pimoroni"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"
+
 #define MICROPY_HW_USB_VID (0x2E8A)
 #define MICROPY_HW_USB_PID (0x1002)
 
diff --git a/micropython/board/RPI_PICO/mpconfigboard.h b/micropython/board/RPI_PICO/mpconfigboard.h
index 8534e4e272..fe56c3861f 100644
--- a/micropython/board/RPI_PICO/mpconfigboard.h
+++ b/micropython/board/RPI_PICO/mpconfigboard.h
@@ -1,3 +1,10 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
\ No newline at end of file
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
+
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_VID (0x1FFB)
+#define MICROPY_HW_USB_PID (0x2043)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pimoroni"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"
\ No newline at end of file
diff --git a/micropython/board/RPI_PICO_W/mpconfigboard.h b/micropython/board/RPI_PICO_W/mpconfigboard.h
index 2b697a1942..11d05ded86 100644
--- a/micropython/board/RPI_PICO_W/mpconfigboard.h
+++ b/micropython/board/RPI_PICO_W/mpconfigboard.h
@@ -21,4 +21,11 @@
 #define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
 
 int mp_hal_is_pin_reserved(int n);
-#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
\ No newline at end of file
+#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
+
+#define MICROPY_HW_USB_MSC (1)
+#define MICROPY_HW_USB_VID (0x1FFB)
+#define MICROPY_HW_USB_PID (0x2043)
+#define MICROPY_HW_USB_DESC_STR_MAX (40)
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Pimoroni"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING MICROPY_HW_BOARD_NAME " MicroPython"