diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml
index fef58534..7f5c5211 100644
--- a/.github/workflows/build-push-docker.yml
+++ b/.github/workflows/build-push-docker.yml
@@ -32,38 +32,46 @@ jobs:
           ref="${ref////-}"
           echo $ref
           echo ::set-output name=tag::$ref
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to DockerHub
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Build and push zookeeper Apache image
         uses: docker/build-push-action@v1
         if: ${{ startsWith(github.ref, 'refs/tags/zk') }}
         with:
-          path: docker/zookeeper-image
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: adobe/zookeeper
-          tags: 3.8.3-apache-${{ steps.vars.outputs.tag }}
+          context: docker/zookeeper-image
+          platforms: linux/amd64,linux/arm64
+          tags: adobe/zookeeper:3.8.3-apache-${{ steps.vars.outputs.tag }}
           add_git_labels: true
           always_pull: true
           push: ${{ startsWith(github.ref, 'refs/tags/zk') }}
+
       - name: Build and push zookeeper image
         if: ${{ !startsWith(github.ref, 'refs/tags/zk') }}
-        uses: docker/build-push-action@v1
+        uses: docker/build-push-action@v5
         with:
-          path: docker
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: adobe/zookeeper
-          tags: 3.8.3-${{ steps.vars.outputs.tag }}
+          context: docker
+          platforms: linux/amd64,linux/arm64
+          tags: adobe/zookeeper:3.8.3-${{ steps.vars.outputs.tag }}
           add_git_labels: true
           always_pull: true
           push: ${{ startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/zk') }}
+
       - name: Build and push zookeeper-operator image
         if: ${{ !startsWith(github.ref, 'refs/tags/zk') }}
-        uses: docker/build-push-action@v1
+        uses: docker/build-push-action@v5
         with:
           dockerfile: Dockerfile
           build_args: VERSION=${{ steps.vars.outputs.tag }},GIT_SHA=${{ github.sha }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
           repository: adobe/zookeeper-operator
           tag_with_ref: true
           add_git_labels: true