From 99718667f479b285f5041a7c74592b03dd56a2b2 Mon Sep 17 00:00:00 2001
From: Hendrik Schawe <hendrik.schawe@codecentric.de>
Date: Thu, 8 Jan 2026 14:55:52 +0100
Subject: [PATCH 1/2] fix: publish both arm64 and amd64 images

---
 .../release-publish-chart-and-container-images.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-publish-chart-and-container-images.yaml b/.github/workflows/release-publish-chart-and-container-images.yaml
index c7816f2e5..cf7e693c8 100644
--- a/.github/workflows/release-publish-chart-and-container-images.yaml
+++ b/.github/workflows/release-publish-chart-and-container-images.yaml
@@ -74,7 +74,11 @@ jobs:
           - confluence-importer
     needs:
       - upstream-workflows
+      - build-container-images
     steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -87,11 +91,10 @@ jobs:
 
       - name: Promote Image
         run: |
-          docker pull ghcr.io/${{ github.repository }}/${{ matrix.image }}:commit-${{ github.sha }}
-          docker tag ghcr.io/${{ github.repository }}/${{ matrix.image }}:commit-${{ github.sha }} ghcr.io/${{ github.repository }}/${{ matrix.image }}:${{ steps.extract_ref.outputs.ref_name }}
-          docker tag ghcr.io/${{ github.repository }}/${{ matrix.image }}:commit-${{ github.sha }} ghcr.io/${{ github.repository }}/${{ matrix.image }}:latest
-          docker push ghcr.io/${{ github.repository }}/${{ matrix.image }}:${{ steps.extract_ref.outputs.ref_name }}
-          docker push ghcr.io/${{ github.repository }}/${{ matrix.image }}:latest
+          docker buildx imagetools create \
+            --tag ghcr.io/${{ github.repository }}/${{ matrix.image }}:${{ steps.extract_ref.outputs.ref_name }} \
+            --tag ghcr.io/${{ github.repository }}/${{ matrix.image }}:latest \
+            ghcr.io/${{ github.repository }}/${{ matrix.image }}:commit-${{ github.sha }}
 
   publish-helm-chart:
     name: Publish Helm Chart

From e5293f0848b97b7d893b2e80349004aad8dd066c Mon Sep 17 00:00:00 2001
From: Hendrik Schawe <hendrik.schawe@codecentric.de>
Date: Thu, 8 Jan 2026 14:57:54 +0100
Subject: [PATCH 2/2] fix: all images pushed to the registry should be
 multi-arch

---
 .github/workflows/push_images.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/push_images.yaml b/.github/workflows/push_images.yaml
index 35f9ccb37..2832cc270 100644
--- a/.github/workflows/push_images.yaml
+++ b/.github/workflows/push_images.yaml
@@ -15,3 +15,4 @@ jobs:
     with:
       push-to-registry: true
       tag-prefix: ghcr.io/${{ github.repository }}/
+      platforms: linux/amd64,linux/arm64