diff --git a/.forgejo/workflows/build-alpine.yaml b/.forgejo/workflows/build-alpine.yaml
index c6c6b9640..cccc46a5b 100644
--- a/.forgejo/workflows/build-alpine.yaml
+++ b/.forgejo/workflows/build-alpine.yaml
@@ -1,4 +1,5 @@
-name: PostmarketOS build
+name: PostmarketOS Build
+run-name: PostmarketOS Build
 on:
   push:
   workflow_dispatch:
@@ -6,29 +7,22 @@ on:
 jobs:
   build:
     runs-on: Pmbootstrap
+    strategy:
+      matrix:
+        info:
+          - arch: x86_64
+          - arch: aarch64
+    name: Build for ${{ matrix.info.arch }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Make temp package dir
-        run: mkdir -p /data/pmaports/temp/libcamera
-      - name: Copy APKBUILD to this dir
-        run: cp ${{ github.workspace }}/misc/APKBUILD /data/pmaports/temp/libcamera
-      - name: Clear local-built packages
-        run: pmbootstrap -y zap -p
-      - name: Run PostmarketOS build
-        run: pmbootstrap build --force libcamera --src ${{ github.workspace }} --arch aarch64
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+      - name: Build package
+        id: build
+        uses: actions/pmbootstrap-build@main
         with:
-          name: build-files
-          path: /data/work/packages/edge/aarch64/*.apk
-      - name: Upload to package registry
-        run: >
-          for apk in /data/work/packages/edge/aarch64/*.apk ; do
-            echo -- Uploading $apk
-            curl -H "Authorization: token ${{secrets.PACKAGE_TOKEN}}" \
-            --upload-file $apk \
-            ${{github.server_url}}/api/packages/${{github.repository_owner}}/alpine/edge/nightly
-          done
-      - name: Clean up
-        run: pmbootstrap -y zap -p
+          name: libcamera
+          aports: ${{github.workspace}}/misc/alpine
+          arch: ${{ matrix.info.arch }}
+          src: ${{github.workspace}}
+      - name: Print new packages
+        run: echo "${{steps.build.outputs.packages}}"
diff --git a/misc/APKBUILD b/misc/alpine/APKBUILD
similarity index 100%
rename from misc/APKBUILD
rename to misc/alpine/APKBUILD