diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e4ccedb..b2dbaa6 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -32,6 +32,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
@@ -39,18 +42,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build and Publish (${{ matrix.php }} / ${{ matrix.arch }})
-        uses: elgohr/Publish-Docker-Github-Action@v5
+      - name: Build and Push (${{ matrix.php }} / ${{ matrix.arch }})
+        uses: docker/build-push-action@v4
         with:
-          name: ${{ env.IMAGE_NAME }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          registry: ${{ env.REGISTRY }}
-          tags: ${{ matrix.php }}
-          dockerfile: Dockerfile-${{ matrix.php }}
-          default_branch: main
+          file: Dockerfile-${{ matrix.php }}
           platforms: ${{ matrix.arch }}
-          cache: ${{ github.event_name != 'schedule' }}
+          push: true
+          tags: ${{ env.IMAGE_NAME }}:${{ matrix.php }}