diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
index e751286d..3b2e3705 100644
--- a/.github/workflows/build-image.yaml
+++ b/.github/workflows/build-image.yaml
@@ -52,15 +52,29 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: ${{ matrix.platform }}
           tags: ${{ steps.meta.outputs.tags }}
-#          build-args: |
-#            GITHUB_SHA=${{ github.sha }}
-          cache-from: type=gha,scope=${{ matrix.platform == 'linux/amd64' && 'build-amd' || 'build-arm'}}
-          cache-to: type=gha,mode=max,scope=${{ matrix.platform == 'linux/amd64' && 'build-amd' || 'build-arm'}}
-          load: true
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GITHUB_SHA=${{ github.sha }}
+#          cache-from: type=gha,scope=${{ matrix.platform == 'linux/amd64' && 'build-amd' || 'build-arm'}}
+#          cache-to: type=gha,mode=max,scope=${{ matrix.platform == 'linux/amd64' && 'build-amd' || 'build-arm'}}
+          outputs: type=image,name=${{ env.IMG_REGISTRY_HOST}}/${{ env.IMG_REGISTRY_ORG }}/limitador,push-by-digest=true,name-canonical=true,push=true
       - name: Smoke Test
         run: |
           docker run --rm -t ${{ env.IMG_REGISTRY_HOST}}/${{ env.IMG_REGISTRY_ORG }}/limitador:${{ github.sha }} limitador-server --help
+      - 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@v3
+        with:
+          name: digests
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
 #      - name: Push Image
 #        if: ${{ !env.ACT }}
 #        id: push-to-quay
@@ -74,3 +88,41 @@ jobs:
 #      - name: Print Image URL
 #        run: |
 #          echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
+#  merge:
+#    runs-on: ubuntu-latest
+#    needs:
+#      - build
+#    steps:
+#      - name: Download digests
+#        uses: actions/download-artifact@v3
+#        with:
+#          name: digests
+#          path: /tmp/digests
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v3
+#      - name: Docker meta
+#        id: meta
+#        uses: docker/metadata-action@v5
+#        with:
+#          images: |
+#            ${{ env.IMG_REGISTRY_HOST}}/${{ env.IMG_REGISTRY_ORG }}/limitador
+#          tags: |
+#            type=raw,value=${{ github.sha }}
+#            # set latest tag for main branch
+#            type=raw,value=latest,enable=${{ github.ref_name == env.MAIN_BRANCH_NAME }}
+#            # set branch name tag for non-main branches
+#            type=raw,value=${{ github.ref_name }},enable=${{ github.ref_name != env.MAIN_BRANCH_NAME }}
+#      - name: Login to container registry
+#        uses: docker/login-action@v2
+#        with:
+#          username: ${{ secrets.IMG_REGISTRY_USERNAME }}
+#          password: ${{ secrets.IMG_REGISTRY_TOKEN }}
+#          registry: ${{ env.IMG_REGISTRY_HOST }}
+#      - 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.IMG_REGISTRY_HOST}}/${{ env.IMG_REGISTRY_ORG }}/limitador@sha256:%s ' *)
+#      - name: Inspect image
+#        run: |
+#          docker buildx imagetools inspect ${{ env.IMG_REGISTRY_HOST}}/${{ env.IMG_REGISTRY_ORG }}/limitador:${{ steps.meta.outputs.version }}
\ No newline at end of file
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index cd276d51..83af14a6 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -30,8 +30,8 @@ jobs:
         with:
           context: .
           tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=gha,scope=e2e
-          cache-to: type=gha,mode=max,scope=e2e
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           load: true
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1.8.0