diff --git a/.github/workflows/daily_packaging.yml b/.github/workflows/daily_packaging.yml
index eb61554f2..b9b52c5e8 100644
--- a/.github/workflows/daily_packaging.yml
+++ b/.github/workflows/daily_packaging.yml
@@ -9,11 +9,11 @@ on:
     paths:
       - debian/**
       - "*.rpkg"
-      - .github/workflows/nightly_packaging.yml
-      - .github/workflows/build_debian_src.yml
-      - .github/workflows/package_ppa.yml
-      - .github/workflows/package_obs.yml
-      - .github/workflows/hook_copr.yml
+      - .github/workflows/daily_packaging.yml
+      - .github/workflows/linux_packaging/debian_src.yml
+      - .github/workflows/linux_packaging/ppa.yml
+      - .github/workflows/linux_packaging/obs.yml
+      - .github/workflows/linux_packaging/copr.yml
 
 permissions:
   contents: write
@@ -21,7 +21,7 @@ permissions:
 
 jobs:
   docker-multiarch:
-    uses: ./.github/workflows/docker_manifest.yml
+    uses: ./.github/workflows/linux_packaging/docker_manifest.yml
     with:
       release_channel: daily
     secrets: inherit
@@ -35,21 +35,21 @@ jobs:
           - noble # 24.04
           - plucky # 25.04
           - questing # 25.10
-    uses: ./.github/workflows/package_ppa.yml
+    uses: ./.github/workflows/linux_packaging/ppa.yml
     with:
       ppa_repo: ppa:meshtastic/daily
       series: ${{ matrix.series }}
     secrets: inherit
 
   package-obs:
-    uses: ./.github/workflows/package_obs.yml
+    uses: ./.github/workflows/linux_packaging/obs.yml
     with:
       obs_project: network:Meshtastic:daily
       series: unstable
     secrets: inherit
 
   hook-copr:
-    uses: ./.github/workflows/hook_copr.yml
+    uses: ./.github/workflows/linux_packaging/copr.yml
     with:
       copr_project: daily
     secrets: inherit
diff --git a/.github/workflows/hook_copr.yml b/.github/workflows/linux_packaging/copr.yml
similarity index 100%
rename from .github/workflows/hook_copr.yml
rename to .github/workflows/linux_packaging/copr.yml
diff --git a/.github/workflows/build_debian_src.yml b/.github/workflows/linux_packaging/debian_src.yml
similarity index 100%
rename from .github/workflows/build_debian_src.yml
rename to .github/workflows/linux_packaging/debian_src.yml
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/linux_packaging/docker_build.yml
similarity index 98%
rename from .github/workflows/docker_build.yml
rename to .github/workflows/linux_packaging/docker_build.yml
index cde7fd274..a6173eac5 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/linux_packaging/docker_build.yml
@@ -42,6 +42,7 @@ permissions:
 
 jobs:
   docker-build:
+    name: docker-${{ inputs.distro }}
     outputs:
       digest: ${{ steps.docker_variant.outputs.digest }}
     runs-on: ${{ inputs.runs-on }}
diff --git a/.github/workflows/docker_manifest.yml b/.github/workflows/linux_packaging/docker_manifest.yml
similarity index 93%
rename from .github/workflows/docker_manifest.yml
rename to .github/workflows/linux_packaging/docker_manifest.yml
index d1d1a5634..6585212a4 100644
--- a/.github/workflows/docker_manifest.yml
+++ b/.github/workflows/linux_packaging/docker_manifest.yml
@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   docker-debian-amd64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/amd64
@@ -26,7 +26,7 @@ jobs:
     secrets: inherit
 
   docker-debian-arm64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/arm64
@@ -35,7 +35,7 @@ jobs:
     secrets: inherit
 
   docker-debian-armv7:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/arm/v7
@@ -44,7 +44,7 @@ jobs:
     secrets: inherit
 
   docker-alpine-amd64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: alpine
       platform: linux/amd64
@@ -53,7 +53,7 @@ jobs:
     secrets: inherit
 
   docker-alpine-arm64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: alpine
       platform: linux/arm64
@@ -62,7 +62,7 @@ jobs:
     secrets: inherit
 
   docker-alpine-armv7:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: alpine
       platform: linux/arm/v7
diff --git a/.github/workflows/package_obs.yml b/.github/workflows/linux_packaging/obs.yml
similarity index 98%
rename from .github/workflows/package_obs.yml
rename to .github/workflows/linux_packaging/obs.yml
index 275ffce0e..5156dee2e 100644
--- a/.github/workflows/package_obs.yml
+++ b/.github/workflows/linux_packaging/obs.yml
@@ -23,7 +23,7 @@ permissions:
 
 jobs:
   build-debian-src:
-    uses: ./.github/workflows/build_debian_src.yml
+    uses: ./.github/workflows/linux_packaging/debian_src.yml
     secrets: inherit
     with:
       series: ${{ inputs.series }}
diff --git a/.github/workflows/package_ppa.yml b/.github/workflows/linux_packaging/ppa.yml
similarity index 96%
rename from .github/workflows/package_ppa.yml
rename to .github/workflows/linux_packaging/ppa.yml
index a54b0bd36..ef089eefb 100644
--- a/.github/workflows/package_ppa.yml
+++ b/.github/workflows/linux_packaging/ppa.yml
@@ -21,7 +21,7 @@ permissions:
 
 jobs:
   build-debian-src:
-    uses: ./.github/workflows/build_debian_src.yml
+    uses: ./.github/workflows/linux_packaging/debian_src.yml
     secrets: inherit
     with:
       series: ${{ inputs.series }}
diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index a676efa1e..3aafced62 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -136,7 +136,7 @@ jobs:
 
   build-debian-src:
     if: github.repository == 'meshtastic/firmware'
-    uses: ./.github/workflows/build_debian_src.yml
+    uses: ./.github/workflows/linux_packaging/debian_src.yml
     with:
       series: UNRELEASED
       build_location: local
@@ -154,7 +154,7 @@ jobs:
     uses: ./.github/workflows/test_native.yml
 
   docker-deb-amd64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/amd64
@@ -162,7 +162,7 @@ jobs:
       push: false
 
   docker-deb-amd64-tft:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/amd64
@@ -171,7 +171,7 @@ jobs:
       pio_env: native-tft
 
   docker-alp-amd64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: alpine
       platform: linux/amd64
@@ -179,7 +179,7 @@ jobs:
       push: false
 
   docker-alp-amd64-tft:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: alpine
       platform: linux/amd64
@@ -188,7 +188,7 @@ jobs:
       pio_env: native-tft
 
   docker-deb-arm64:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/arm64
@@ -196,7 +196,7 @@ jobs:
       push: false
 
   docker-deb-armv7:
-    uses: ./.github/workflows/docker_build.yml
+    uses: ./.github/workflows/linux_packaging/docker_build.yml
     with:
       distro: debian
       platform: linux/arm/v7
diff --git a/.github/workflows/release_channels.yml b/.github/workflows/release_channels.yml
index ef03be9dc..50bd1fba1 100644
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   build-docker:
-    uses: ./.github/workflows/docker_manifest.yml
+    uses: ./.github/workflows/linux_packaging/docker_manifest.yml
     with:
       release_channel: |-
         ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
@@ -25,7 +25,7 @@ jobs:
           - noble # 24.04
           - plucky # 25.04
           # - questing # 25.10
-    uses: ./.github/workflows/package_ppa.yml
+    uses: ./.github/workflows/linux_packaging/ppa.yml
     with:
       ppa_repo: |-
         ppa:meshtastic/${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
@@ -33,7 +33,7 @@ jobs:
     secrets: inherit
 
   package-obs:
-    uses: ./.github/workflows/package_obs.yml
+    uses: ./.github/workflows/linux_packaging/obs.yml
     with:
       obs_project: |-
         network:Meshtastic:${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
@@ -42,7 +42,7 @@ jobs:
     secrets: inherit
 
   hook-copr:
-    uses: ./.github/workflows/hook_copr.yml
+    uses: ./.github/workflows/linux_packaging/copr.yml
     with:
       copr_project: |-
         ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/trunk_nightly.yml
similarity index 97%
rename from .github/workflows/nightly.yml
rename to .github/workflows/trunk_nightly.yml
index 309772b12..4f1e9b426 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/trunk_nightly.yml
@@ -1,4 +1,4 @@
-name: Nightly
+name: Trunk Nightly
 on:
   schedule:
     - cron: 0 8 * * 1-5
diff --git a/bin/build-firmware.sh b/bin/build-firmware.sh
index c53f1b660..933c9bfe6 100644
--- a/bin/build-firmware.sh
+++ b/bin/build-firmware.sh
@@ -10,8 +10,8 @@ elif (echo $2 | grep -q "nrf52"); then
   bin/build-nrf52.sh $1
 elif (echo $2 | grep -q "stm32"); then
   bin/build-stm32.sh $1
-elif (echo $2 | grep -q "rpi2040"); then
-  bin/build-rpi2040.sh $1
+elif (echo $2 | grep -q "rp2xx0"); then
+  bin/build-rp2xx0.sh $1
 else
   echo "Unknown target $2"
   exit 1