diff --git a/boards/common.cmake b/boards/common.cmake
new file mode 100644
index 0000000..771ad63
--- /dev/null
+++ b/boards/common.cmake
@@ -0,0 +1,32 @@
+# Make sure we get our VirtualEnv Python
+set(Python_FIND_VIRTUALENV "FIRST")
+set(Python_FIND_UNVERSIONED_NAMES "FIRST")
+set(Python_FIND_STRATEGY "LOCATION")
+find_package (Python COMPONENTS Interpreter Development)
+
+message("dir2uf2/py_decl: Using Python ${Python_EXECUTABLE}")
+
+# Convert supplies paths to absolute, for a quieter life
+get_filename_component(PIMORONI_UF2_MANIFEST ${PIMORONI_UF2_MANIFEST} REALPATH)
+get_filename_component(PIMORONI_UF2_DIR ${PIMORONI_UF2_DIR} REALPATH)
+
+if (EXISTS "${PIMORONI_TOOLS_DIR}/py_decl/py_decl.py")
+    add_custom_target("${MICROPY_TARGET}-verify" ALL
+        COMMAND ${Python_EXECUTABLE} "${PIMORONI_TOOLS_DIR}/py_decl/py_decl.py" --to-json --verify "${CMAKE_CURRENT_BINARY_DIR}/${MICROPY_TARGET}.uf2"
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "pydecl: Verifying ${MICROPY_TARGET}.uf2"
+        DEPENDS ${MICROPY_TARGET}
+    )
+endif()
+
+if (EXISTS "${PIMORONI_TOOLS_DIR}/dir2uf2/dir2uf2" AND EXISTS "${PIMORONI_UF2_MANIFEST}" AND EXISTS "${PIMORONI_UF2_DIR}")
+    MESSAGE("dir2uf2: Using manifest ${PIMORONI_UF2_MANIFEST}.")
+    MESSAGE("dir2uf2: Using root ${PIMORONI_UF2_DIR}.")
+    add_custom_target("${MICROPY_TARGET}-with-filesystem.uf2" ALL
+        COMMAND ${Python_EXECUTABLE} "${PIMORONI_TOOLS_DIR}/dir2uf2/dir2uf2" --fs-compact --sparse --append-to "${MICROPY_TARGET}.uf2" --manifest "${PIMORONI_UF2_MANIFEST}" --filename with-filesystem.uf2 "${PIMORONI_UF2_DIR}"
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        COMMENT "dir2uf2: Appending filesystem to ${MICROPY_TARGET}.uf2."
+        DEPENDS ${MICROPY_TARGET}
+        DEPENDS "${MICROPY_TARGET}-verify"
+    )
+endif()
\ No newline at end of file
diff --git a/boards/pico2_w_cosmic/mpconfigboard.cmake b/boards/pico2_w_cosmic/mpconfigboard.cmake
index 870716f..3e00d66 100644
--- a/boards/pico2_w_cosmic/mpconfigboard.cmake
+++ b/boards/pico2_w_cosmic/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
 set(MICROPY_BOARD RPI_PICO_W)
 set(PICO_BOARD "pico2_w")
+set(UNICORN "cosmic")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
@@ -14,4 +15,9 @@ set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# dir2uf2 manifest and root directory
+set(PIMORONI_UF2_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/manifest.txt)
+set(PIMORONI_UF2_DIR ${CMAKE_CURRENT_LIST_DIR}/../../examples/${UNICORN}_unicorn/launch)
+include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
\ No newline at end of file
diff --git a/boards/pico2_w_cosmic/usermodules.cmake b/boards/pico2_w_cosmic/usermodules.cmake
deleted file mode 100644
index f106b08..0000000
--- a/boards/pico2_w_cosmic/usermodules.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-set(UNICORN "cosmic")
-include(usermod-common)
\ No newline at end of file
diff --git a/boards/pico2_w_galactic/mpconfigboard.cmake b/boards/pico2_w_galactic/mpconfigboard.cmake
index 870716f..355190d 100644
--- a/boards/pico2_w_galactic/mpconfigboard.cmake
+++ b/boards/pico2_w_galactic/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
 set(MICROPY_BOARD RPI_PICO_W)
 set(PICO_BOARD "pico2_w")
+set(UNICORN "galactic")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
@@ -14,4 +15,9 @@ set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# dir2uf2 manifest and root directory
+set(PIMORONI_UF2_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/manifest.txt)
+set(PIMORONI_UF2_DIR ${CMAKE_CURRENT_LIST_DIR}/../../examples/${UNICORN}_unicorn/launch)
+include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
\ No newline at end of file
diff --git a/boards/pico2_w_galactic/usermodules.cmake b/boards/pico2_w_galactic/usermodules.cmake
deleted file mode 100644
index 57ecac5..0000000
--- a/boards/pico2_w_galactic/usermodules.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-set(UNICORN "galactic")
-include(usermod-common)
\ No newline at end of file
diff --git a/boards/pico2_w_stellar/mpconfigboard.cmake b/boards/pico2_w_stellar/mpconfigboard.cmake
index 870716f..9cfde62 100644
--- a/boards/pico2_w_stellar/mpconfigboard.cmake
+++ b/boards/pico2_w_stellar/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
 set(MICROPY_BOARD RPI_PICO_W)
 set(PICO_BOARD "pico2_w")
+set(UNICORN "stellar")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
@@ -14,4 +15,9 @@ set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# dir2uf2 manifest and root directory
+set(PIMORONI_UF2_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/manifest.txt)
+set(PIMORONI_UF2_DIR ${CMAKE_CURRENT_LIST_DIR}/../../examples/${UNICORN}_unicorn/launch)
+include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
\ No newline at end of file
diff --git a/boards/pico2_w_stellar/usermodules.cmake b/boards/pico2_w_stellar/usermodules.cmake
deleted file mode 100644
index 9df86a9..0000000
--- a/boards/pico2_w_stellar/usermodules.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-set(UNICORN "stellar")
-include(usermod-common)
\ No newline at end of file
diff --git a/boards/pico_w_cosmic/mpconfigboard.cmake b/boards/pico_w_cosmic/mpconfigboard.cmake
index 7feece0..97428fd 100644
--- a/boards/pico_w_cosmic/mpconfigboard.cmake
+++ b/boards/pico_w_cosmic/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
 set(MICROPY_BOARD RPI_PICO_W)
 set(PICO_BOARD "pico_w")
+set(UNICORN "cosmic")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
@@ -14,4 +15,9 @@ set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# dir2uf2 manifest and root directory
+set(PIMORONI_UF2_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/manifest.txt)
+set(PIMORONI_UF2_DIR ${CMAKE_CURRENT_LIST_DIR}/../../examples/${UNICORN}_unicorn/launch)
+include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
\ No newline at end of file
diff --git a/boards/pico_w_cosmic/usermodules.cmake b/boards/pico_w_cosmic/usermodules.cmake
deleted file mode 100644
index a4e2261..0000000
--- a/boards/pico_w_cosmic/usermodules.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-set(UNICORN "cosmic")
-include(usermod-common)
diff --git a/boards/pico_w_galactic/mpconfigboard.cmake b/boards/pico_w_galactic/mpconfigboard.cmake
index 7feece0..f5d384b 100644
--- a/boards/pico_w_galactic/mpconfigboard.cmake
+++ b/boards/pico_w_galactic/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
 set(MICROPY_BOARD RPI_PICO_W)
 set(PICO_BOARD "pico_w")
+set(UNICORN "galactic")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
@@ -14,4 +15,9 @@ set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# dir2uf2 manifest and root directory
+set(PIMORONI_UF2_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/manifest.txt)
+set(PIMORONI_UF2_DIR ${CMAKE_CURRENT_LIST_DIR}/../../examples/${UNICORN}_unicorn/launch)
+include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
\ No newline at end of file
diff --git a/boards/pico_w_galactic/usermodules.cmake b/boards/pico_w_galactic/usermodules.cmake
deleted file mode 100644
index 49df3aa..0000000
--- a/boards/pico_w_galactic/usermodules.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-set(UNICORN "galactic")
-include(usermod-common)
diff --git a/boards/pico_w_stellar/mpconfigboard.cmake b/boards/pico_w_stellar/mpconfigboard.cmake
index 7feece0..969a70f 100644
--- a/boards/pico_w_stellar/mpconfigboard.cmake
+++ b/boards/pico_w_stellar/mpconfigboard.cmake
@@ -1,6 +1,7 @@
 # cmake file for Pimoroni Inky with Raspberry Pi Pico W
 set(MICROPY_BOARD RPI_PICO_W)
 set(PICO_BOARD "pico_w")
+set(UNICORN "stellar")
 
 # The C malloc is needed by cyw43-driver Bluetooth and Pimoroni Pico modules
 set(MICROPY_C_HEAP_SIZE 4096)
@@ -14,4 +15,9 @@ set(MICROPY_BLUETOOTH_BTSTACK ON)
 set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# dir2uf2 manifest and root directory
+set(PIMORONI_UF2_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/manifest.txt)
+set(PIMORONI_UF2_DIR ${CMAKE_CURRENT_LIST_DIR}/../../examples/${UNICORN}_unicorn/launch)
+include(${CMAKE_CURRENT_LIST_DIR}/../common.cmake)
\ No newline at end of file
diff --git a/boards/pico_w_stellar/usermodules.cmake b/boards/pico_w_stellar/usermodules.cmake
deleted file mode 100644
index fe5d56f..0000000
--- a/boards/pico_w_stellar/usermodules.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../")
-set(UNICORN "stellar")
-include(usermod-common)
diff --git a/ci/micropython.sh b/ci/micropython.sh
index bd628f8..cd43beb 100644
--- a/ci/micropython.sh
+++ b/ci/micropython.sh
@@ -52,7 +52,8 @@ function ci_micropython_clone {
     git submodule update --init lib/micropython-lib
     git submodule update --init lib/tinyusb
     git submodule update --init lib/btstack
-    log_inform "HACK: Patching dma aborts for Pico2 W."
+    cd "$CI_BUILD_ROOT"
+    log_inform "HACK: cyw43 stability backport for Pico2 W. See: https://github.com/raspberrypi/pico-sdk/pull/2209"
     cd "$CI_BUILD_ROOT/micropython/lib/pico-sdk"
     git apply "$CI_PROJECT_ROOT/boards/pico2_w_cyw43.patch"
     cd "$CI_BUILD_ROOT"
@@ -62,6 +63,7 @@ function ci_tools_clone {
     mkdir -p "$CI_BUILD_ROOT/tools"
     git clone https://github.com/gadgetoid/py_decl -b "$PY_DECL_VERSION" "$CI_BUILD_ROOT/tools/py_decl"
     git clone https://github.com/gadgetoid/dir2uf2 -b "$DIR2UF2_VERSION" "$CI_BUILD_ROOT/tools/dir2uf2"
+    python3 -m pip install littlefs-python==0.12.0
 }
 
 function ci_micropython_build_mpy_cross {
@@ -96,18 +98,21 @@ function micropython_version {
 
 function ci_cmake_configure {
     BOARD=$1
+    TOOLS_DIR="$CI_BUILD_ROOT/tools"
     MICROPY_BOARD_DIR=$CI_PROJECT_ROOT/boards/$BOARD
-    if [ ! -f "$MICROPY_BOARD_DIR/usermodules.cmake" ]; then
+    if [ ! -f "$MICROPY_BOARD_DIR/mpconfigboard.cmake" ]; then
         log_warning "Invalid board: $MICROPY_BOARD_DIR"
         return 1
     fi
+    USER_C_MODULES_FILE="$CI_PROJECT_ROOT/boards/usermod-common.cmake"
     BUILD_DIR="$CI_BUILD_ROOT/build-$BOARD"
     cmake -S $CI_BUILD_ROOT/micropython/ports/rp2 -B "$BUILD_DIR" \
     -DPICOTOOL_FORCE_FETCH_FROM_GIT=1 \
     -DPICO_BUILD_DOCS=0 \
     -DPICO_NO_COPRO_DIS=1 \
     -DPIMORONI_PICO_PATH="$CI_BUILD_ROOT/pimoroni-pico" \
-    -DUSER_C_MODULES="$MICROPY_BOARD_DIR/usermodules.cmake" \
+    -DPIMORONI_TOOLS_DIR="$TOOLS_DIR" \
+    -DUSER_C_MODULES="$USER_C_MODULES_FILE" \
     -DMICROPY_BOARD_DIR="$MICROPY_BOARD_DIR" \
     -DMICROPY_BOARD="$BOARD" \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -117,27 +122,16 @@ function ci_cmake_configure {
 function ci_cmake_build {
     BOARD=$1
     MICROPY_BOARD_DIR=$CI_PROJECT_ROOT/boards/$BOARD
-    # Hack to deal with each board needing its own baked directory
-    # TODO: We should probably define some means to configure this
-    # Like using CMake to invoke dir2uf2
-    EXAMPLES_DIR="$(printf $BOARD | cut -d_ -f3)_unicorn/launch"
-    EXAMPLES_ROOT="$CI_PROJECT_ROOT/examples"
-    TOOLS_DIR=$CI_BUILD_ROOT/tools
     BUILD_DIR="$CI_BUILD_ROOT/build-$BOARD"
     ccache --zero-stats || true
     cmake --build $BUILD_DIR -j 2
     ccache --show-stats || true
-    if [ -d "$TOOLS_DIR/py_decl" ]; then
-        log_inform "Tools found, verifying .uf2 with py_decl..."
-        python3 "$TOOLS_DIR/py_decl/py_decl.py" --to-json --verify "$BUILD_DIR/firmware.uf2"
-    fi
+
     log_inform "Copying .uf2 to $(pwd)/$BOARD.uf2"
     cp "$BUILD_DIR/firmware.uf2" $BOARD.uf2
 
-    if [ -f "$MICROPY_BOARD_DIR/manifest.txt" ] && [ -d "$TOOLS_DIR/dir2uf2" ]; then
-        log_inform "Creating $(pwd)/$BOARD-with-filesystem.uf2"
-        log_inform "Using dir: $EXAMPLES_ROOT/$EXAMPLES_DIR"
-        python3 -m pip install littlefs-python==0.12.0
-        $TOOLS_DIR/dir2uf2/dir2uf2 --fs-compact --sparse --append-to "$(pwd)/$BOARD.uf2" --manifest "$MICROPY_BOARD_DIR/manifest.txt" --filename with-filesystem.uf2 "$EXAMPLES_ROOT/$EXAMPLES_DIR"
+    if [ -f "$BUILD_DIR/firmware-with-filesystem.uf2" ]; then
+        log_inform "Copying -with-filesystem .uf2 to $(pwd)/$BOARD-with-filesystem.uf2"
+        cp "$BUILD_DIR/firmware-with-filesystem.uf2" $BOARD-with-filesystem.uf2
     fi
 }