diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6e997aa..1b2f32e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:  # yamllint disable-line rule:truthy
       - master
   release:
     types:
-      - published
+      - released
 
 env:
   DOCKER_NAMESPACE: wayofdev/php-base
@@ -27,7 +27,7 @@ jobs:
         os_name: ["alpine"]
         php_version: ["8.1", "8.2", "8.3"]
         php_type: ["fpm", "cli", "supervisord"]
-        builder: [{arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "ubuntu-latest"}]
+        builder: [{arch: "amd64", os: "ubuntu-latest"}, {arch: "arm64", os: "macos-latest"}]
     runs-on: ${{ matrix.builder.os }}
     steps:
 
@@ -52,10 +52,13 @@ jobs:
 
       - name: 🖥️ Setup docker QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/${{ matrix.builder.arch }}
 
       - name: 🛠️ Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
+          platforms: linux/${{ matrix.builder.arch }}
           buildkitd-flags: "--debug"
 
       - name: 🐳 Extract docker meta data
@@ -177,10 +180,13 @@ jobs:
 
       - name: 🖥️ Setup docker QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
 
       - name: 🛠️ Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
+          platforms: linux/amd64,linux/arm64
           buildkitd-flags: "--debug"
 
       - name: Create manifest list and push
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b8adb97..06626cf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,11 +5,6 @@ concurrency:
   cancel-in-progress: true
 
 on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**.md'
   pull_request:
     paths-ignore:
       - '**.md'