diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 798dc6a1..ed066f4e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,48 +2,47 @@ name: Publish
 
 on:
   workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version number'
-        required: true
 
 jobs:
   build:
+    name: ${{ matrix.name }}
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+        - name: "Raspberry Pi 32-bit"
+          id: "32bit"  
+        - name: "Raspberry Pi 64-bit"
+          id: "64bit" 
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          path: publish/build
 
       - name: Extract version from file
         id: get_version
         run: |
-          VERSION=$(cut -d "'" -f2 < pwnagotchi/_version.py)
+          VERSION=$(cut -d "'" -f2 < publish/build/pwnagotchi/_version.py)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Install qemu dependencies
         run: sudo apt update && sudo apt install qemu-user-static qemu-utils xz-utils -y
 
-      - name: Build img file
-        run: ls -la .; pwd; make all
-
-      - name: Transfer 32bit.img to docker and give permissions
-        run: sudo chown runner:docker "pwnagotchi-32bit.img"
-
-      - name: Transfer 64bit.img to docker and give permissions
-        run: sudo chown runner:docker "pwnagotchi-64bit.img"
+      - name: Build ${{ matrix.name }} img file
+        run: cd publish/build; ls -la .; pwd; make packer; make ${{ matrix.id }}
+      
+      - name: Change name of .img.xz to add version
+        run: |
+          sudo chown runner:docker "pwnagotchi-${{ matrix.id }}.img"
+          mv "pwnagotchi-${{ matrix.id }}.img" "pwnagotchi-${{ env.VERSION }}-${{ matrix.id }}.img"
 
       - name: PiShrink
         run: |
           wget https://raw.githubusercontent.com/Drewsif/PiShrink/master/pishrink.sh
           chmod +x pishrink.sh
           sudo mv pishrink.sh /usr/local/bin
-          find /home/runner/work/ -type f -name "*.img" -exec sudo pishrink.sh -aZ {} \;
-
-      - name: Change name of 32.img.xz to add version
-        run: mv "pwnagotchi-32bit.img.xz" "pwnagotchi-$VERSION-32bit.img.xz"
-
-      - name: Change name of 64.img.xz to add version
-        run: mv "pwnagotchi-64bit.img.xz" "pwnagotchi-$VERSION-64bit.img.xz"
+          sudo pishrink.sh -aZ "pwnagotchi-${{ env.VERSION }}-${{ matrix.id }}.img"
 
       - name: Release
         uses: softprops/action-gh-release@v2
@@ -52,7 +51,5 @@ jobs:
           make_latest: true
           tag_name: v${{ env.VERSION }}
           name: Pwnagotchi v${{ env.VERSION }}
-          files: |
-              pwnagotchi-${{ env.VERSION }}-32bit.img.xz
-              pwnagotchi-${{ env.VERSION }}-64bit.img.xz
-          generate_release_notes: true
\ No newline at end of file
+          files: pwnagotchi-${{ env.VERSION }}-${{ matrix.id }}.img.xz
+          generate_release_notes: true
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index c3d0790e..a839bf6b 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -90,7 +90,7 @@
           - libopenblas-dev # https://stackoverflow.com/questions/14570011/explain-why-numpy-should-not-be-imported-from-source-directory
           - libopenjp2-7
           - libpcap-dev
-          - libraspberrypi-bin
+          #- libraspberrypi-bin      ## seems to be provided by raspi-utils now
           - libraspberrypi-dev
           - libraspberrypi-doc
           - libraspberrypi0
@@ -557,4 +557,4 @@
     - name: reload systemd services
       systemd:
         daemon_reload: yes
-      when: enabled.changed
\ No newline at end of file
+      when: enabled.changed
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 4cb36738..31ed132f 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -83,7 +83,7 @@
           - libgmp3-dev
           - libnetfilter-queue-dev
           - libpcap-dev
-          - libraspberrypi-bin
+          #- libraspberrypi-bin      ## seems to be provided by raspi-utils now
           - libraspberrypi-dev
           - libraspberrypi-doc
           - libraspberrypi0
@@ -628,4 +628,4 @@
     - name: reload systemd services
       systemd:
         daemon_reload: yes
-      when: enabled.changed
\ No newline at end of file
+      when: enabled.changed