diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index cd80918b1..f1e0d13d5 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -37,11 +37,11 @@ jobs:
         username: ${{ secrets.DOCKER_HUB_UID }}
         password: ${{ secrets.DOCKER_HUB_PAT }}
 
-    - name: Build and push default image
-      uses: docker/build-push-action@v3.2.0
-      with:
-        context: . # Because GH actions are for kids and put protection on everything; https://stackoverflow.com/a/71159809/11276254
-        push: true
-        tags: |
-          ghcr.io/${{ github.repository }}/go-songbird:${{ env.IMAGE_TAG }}
-          ${{ secrets.DOCKER_HUB_REPO }}:${{ env.IMAGE_TAG }}
\ No newline at end of file
+    - name: Build image
+      run: |        
+        docker buildx build \
+          --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
+          --tag ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} \
+          --tag ${{ secrets.DOCKER_HUB_REPO }}:${{ env.IMAGE_TAG }} \
+          --file ./Dockerfile \
+          --output type=image,push=true .
\ No newline at end of file