diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f4429a2..7f5182b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,15 +19,17 @@ jobs:
     steps:
       - name: "Checkout source code at current commit"
         uses: actions/checkout@v4
-      - name: "Build and push docker image to DockerHub"
-        uses: docker/build-push-action@v2
+
+      - name: Build
+        id: build
+        uses: cloudposse/github-action-docker-build-push@1.15.1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          repository: ${{ github.repository }}
           registry: registry-1.docker.io
-          tag_with_ref: true
-          tag_with_sha: true
+          organization: "${{ github.event.repository.owner.login }}"
+          repository: "${{ github.event.repository.name }}"
+          login: "${{ secrets.DOCKERHUB_USERNAME }}"
+          password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          platforms: linux/amd64,linux/arm64
 
   release:
     if: github.event_name == 'push'