diff --git a/.github/workflows/docker-bake.hcl b/.github/workflows/docker-bake.hcl
new file mode 100644
index 0000000..435ff7a
--- /dev/null
+++ b/.github/workflows/docker-bake.hcl
@@ -0,0 +1,36 @@
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+variable TAG {
+    default = "latest-snapshot"
+}
+
+variable DOCKER_FILE {
+    default = "Dockerfile"
+}
+
+target "bake-platform" {
+  inherits = ["docker-metadata-action"]
+  dockerfile = "$DOCKER_FILE"
+  context = "./"
+  tags = ["${TAG}"]
+  platforms = [
+    "linux/amd64",
+    "linux/arm64/v8",
+  ]
+}
\ No newline at end of file
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index f1ee3a9..cdda9a0 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -48,26 +48,39 @@
       - uses: actions/checkout@v3
         with:
           ref: ${{ matrix.build.branch }}
-      - name: Set env
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Prepare Dockerfiles and set env
         run: |
           IMAGE_NAME=${{ matrix.build.flink_version }}-scala_2.12-java${{ matrix.java_version }}
           echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
           echo "TAG=${REGISTRY}/${OWNER}/${IMAGE_REPO}:${IMAGE_NAME}-debian" >> $GITHUB_ENV
+          ./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-${{ matrix.build.flink_version }}-bin-scala_2.12.tgz" -j ${{ matrix.java_version }} -n ${IMAGE_NAME}
+          echo "DOCKER_FILE=$(ls ./*/*${{ matrix.build.flink_version }}*${{ matrix.java_version }}*/Dockerfile)" >> $GITHUB_ENV
+
       - name: Environment
         run: env
-      - name: Prepare Dockerfiles
-        run: |
-          ./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-${{ matrix.build.flink_version }}-bin-scala_2.12.tgz" -j ${{ matrix.java_version }} -n ${IMAGE_NAME}
-      - name: Build image
-        run: |
-          dockerfile="$(ls ./*/*${{ matrix.build.flink_version }}*${{ matrix.java_version }}*/Dockerfile)"
-          dockerfile_dir="$(dirname "$dockerfile")"
-          echo "===> Building ${TAG} image from ${dockerfile_dir}"
-          docker build -t ${TAG} ${dockerfile_dir}
-      - name: Docker login
-        run: |
-          docker login ${REGISTRY} -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }}
-      - name: "Publish snapshots"
-        run: |
-          docker push "${TAG}"
 
+      - name: Build and push Docker images (supported platforms)
+        uses: docker/bake-action@v1.7.0
+        with:
+          files: |
+            .github/workflows/docker-bake.hcl
+            ${{ steps.meta.outputs.bake-file }}
+          targets: bake-platform
+          push: ${{ github.event_name != 'pull_request' }}