diff --git a/.forgejo/workflows/build-alpine.yaml b/.forgejo/workflows/build-alpine.yaml
index ca03306..ceeea32 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,13 +7,25 @@ on:
 jobs:
   build:
     runs-on: Pmbootstrap
+    strategy:
+      matrix:
+        info:
+          - arch: aarch64
+          - arch: x86_64
+    name: Build for ${{ matrix.info.arch }}
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Build package
-        uses: Administration/pmbootstrap-build-action
+        id: build
+        uses: actions/pmbootstrap-build@main
         with:
-          package-name: pipetap
-          apkbuild-dir: ${{github.workspace}}/misc
-          arch: aarch64
+          name: pipetap
+          aports: ${{github.workspace}}/misc/alpine
+          arch: ${{ matrix.info.arch }}
           src: ${{github.workspace}}
+      - name: "Upload packages"
+        uses: actions/upload-alpine-package@main
+        with:
+          files: ${{steps.build.outputs.packages}}
+          secret: ${{secrets.PACKAGE_TOKEN}}
diff --git a/misc/APKBUILD b/misc/alpine/APKBUILD
similarity index 100%
rename from misc/APKBUILD
rename to misc/alpine/APKBUILD