diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4b57733a..c6039c04 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -23,28 +23,69 @@ jobs:
     environment:
       name: Production
 
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm/v6
+          - linux/arm/v7
+          - linux/arm64
+
     steps:
+
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Prepare Platform_pair
+      run: |
+        platform=${{ matrix.platform }}
+        echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
+    - name: Build and push Docker image
+      id: build
+      uses: docker/build-push-action@v6
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        context: .
+        tags: ${{ steps.meta.outputs.tags }}
+        outputs: type=image,name=freqtradeorg/frequi,push-by-digest=true,name-canonical=true,push=true
 
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
+    - name: Export digest
+      run: |
+        mkdir -p /tmp/digests
+        digest="${{ steps.build.outputs.digest }}"
+        touch "/tmp/digests/${digest#sha256:}"
+
+    - name: Upload digest
+      uses: actions/upload-artifact@v4
       with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        name: digests-${{ env.PLATFORM_PAIR }}
+        path: /tmp/digests/*
+        if-no-files-found: error
+        retention-days: 1
+
+
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+    - name: Download digests
+      uses: actions/download-artifact@v4
+      with:
+        path: /tmp/digests
+        pattern: digests-*
+        merge-multiple: true
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
 
     - name: Docker meta
       id: meta
@@ -60,12 +101,25 @@ jobs:
            type=semver,pattern={{version}}
            type=ref,event=branch
 
-
-    - name: Build and push Docker image
-      id: build-and-push
-      uses: docker/build-push-action@v6
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
       with:
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        context: .
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Create manifest list and push
+      working-directory: /tmp/digests
+      run: |
+        docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+          $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+    - name: Inspect image
+      run: |
+        docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}