diff --git a/.github/workflows/build_debian_src.yml b/.github/workflows/build_debian_src.yml
index 9bb7dfb9c2..b2fcb52624 100644
--- a/.github/workflows/build_debian_src.yml
+++ b/.github/workflows/build_debian_src.yml
@@ -7,7 +7,7 @@ on:
         required: true
     inputs:
       series:
-        description: 'Ubuntu series to target'
+        description: Ubuntu series to target
         required: true
         type: string
 
@@ -32,9 +32,9 @@ jobs:
         working-directory: meshtasticd
         run: |
           sudo apt-get update -y --fix-missing
-          sudo apt-get install -y software-properties-common
-          sudo add-apt-repository ppa:meshtastic/meshtastic-daily -y
-          sudo apt-get install -y build-essential devscripts equivs
+          sudo apt-get install -y software-properties-common build-essential devscripts equivs
+          sudo add-apt-repository ppa:meshtastic/build-tools -y
+          sudo apt-get update -y --fix-missing
           sudo mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
 
       - name: Import GPG key
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5010707dec..b7cf4bfc65 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -24,5 +24,6 @@ jobs:
         series: [plucky, oracular, noble, jammy]
     uses: ./.github/workflows/package_ppa.yml
     with:
+      ppa_repo: daily
       series: ${{ matrix.series }}
     secrets: inherit
diff --git a/.github/workflows/package_ppa.yml b/.github/workflows/package_ppa.yml
index f716fdff4a..5705c6d49e 100644
--- a/.github/workflows/package_ppa.yml
+++ b/.github/workflows/package_ppa.yml
@@ -6,8 +6,12 @@ on:
       PPA_GPG_PRIVATE_KEY:
         required: true
     inputs:
+      ppa_repo:
+        description: Meshtastic PPA to target
+        required: true
+        type: string
       series:
-        description: 'Ubuntu series to target'
+        description: Ubuntu series to target
         required: true
         type: string
   workflow_dispatch:
@@ -65,4 +69,4 @@ jobs:
       - name: Publish with dput
         if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         run: |
-          dput ppa:meshtastic/meshtastic-daily meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
+          dput ppa:meshtastic/${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh
index 427e9c79b8..3099b65690 100755
--- a/debian/ci_pack_sdeb.sh
+++ b/debian/ci_pack_sdeb.sh
@@ -13,8 +13,8 @@ rm -rf pio
 package=$(dpkg-parsechangelog --show-field Source)
 
 rm -rf debian/changelog
-dch --create --distribution $SERIES --package $package --newversion $PKG_VERSION~$SERIES \
+dch --create --distribution "$SERIES" --package "$package" --newversion "$PKG_VERSION~$SERIES" \
 	"GitHub Actions Automatic packaging for $PKG_VERSION~$SERIES"
 
 # Build the source deb
-debuild -S -nc -k$GPG_KEY_ID
+debuild -S -nc -k"$GPG_KEY_ID"