diff --git a/.github/workflows/docker-elasticsearch-setup.yml b/.github/workflows/docker-elasticsearch-setup.yml
index 4130293501..a0430c5fc6 100644
--- a/.github/workflows/docker-elasticsearch-setup.yml
+++ b/.github/workflows/docker-elasticsearch-setup.yml
@@ -57,6 +57,10 @@ jobs:
           # add git short SHA as Docker tag
           tag-custom: ${{ needs.setup.outputs.tag }}
           tag-custom-only: true
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ needs.setup.outputs.publish == 'true' }}
         uses: docker/login-action@v1
@@ -67,5 +71,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: ./docker/elasticsearch-setup/Dockerfile
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.docker_meta.outputs.tags }}
           push: ${{ needs.setup.outputs.publish == 'true' }}