diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 7d6e88958..c97cf2bd9 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -27,6 +27,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -40,7 +46,10 @@ jobs:
           #
           # See: https://quarkus.io/guides/tests-with-coverage#coverage-for-integration-tests
           #
-          mvn verify -Pdocker -B --no-transfer-progress -Dquarkus.package.write-transformed-bytecode-to-build-output=true -f api/pom.xml
+          mvn verify -Pdocker -B --no-transfer-progress \
+            -Dquarkus.package.write-transformed-bytecode-to-build-output=true \
+            -Dquarkus.docker.buildx.platform=linux/amd64,linux/arm64 \
+            -f api/pom.xml
 
       - name: Archive Results
         uses: actions/upload-artifact@v4
@@ -72,10 +81,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build UI Image
         uses: docker/build-push-action@v5
         with:
           context: ui/
+          platforms: linux/amd64,linux/arm64
           push: false
           tags: |
             eyefloaters/ui:latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b32e19bc8..945f1254a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,6 +33,12 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and Push API Image
         run: |
           git config --global user.name "github-actions[bot]"
@@ -49,7 +55,7 @@ jobs:
           export QUARKUS_CONTAINER_IMAGE_ADDITIONAL_TAGS=latest
           export GIT_REVISION=$(git rev-parse --short release)
           # Build and push the release images using the commit tagged in `release:prepare`
-          mvn -B -P docker release:perform -f api/pom.xml
+          mvn -B -P docker release:perform -Dquarkus.docker.buildx.platform=linux/amd64,linux/arm64 -f api/pom.xml
 
       - name: Login to Quay
         uses: docker/login-action@v3
@@ -57,11 +63,12 @@ jobs:
           registry: "${{ secrets.IMAGE_REPO_HOSTNAME }}"
           username: "${{ secrets.IMAGE_REPO_USERNAME }}"
           password: "${{ secrets.IMAGE_REPO_PASSWORD }}"
-      
+
       - name: Build and Push UI Image
         uses: docker/build-push-action@v5
         with:
           context: ui/
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ${{ secrets.IMAGE_REPO_HOSTNAME }}/${{ secrets.IMAGE_REPO_NAMESPACE }}/console-ui:${{steps.metadata.outputs.current-version}}