diff --git a/.github/workflows/continuous_delivery.yml b/.github/workflows/continuous_delivery.yml
index 97993824..f3ade794 100644
--- a/.github/workflows/continuous_delivery.yml
+++ b/.github/workflows/continuous_delivery.yml
@@ -3,9 +3,6 @@ name: Continuous Delivery
 on:
   release:
     types: [ published ]
-  push:
-    branches:
-      - main
 
 jobs:
   release:
@@ -24,11 +21,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push Docker image for release
-        if: github.event_name == 'release'
         run: |
           make release GOTENBERG_VERSION=${{ github.event.release.tag_name }}
           make release GOTENBERG_VERSION=${{ github.event.release.tag_name }} DOCKER_REPOSITORY=thecodingmachine
-      - name: Build and push Docker image for main branch
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        run: |
-          make release GOTENBERG_VERSION=edge
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 880c8497..6f6a9d56 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -45,4 +45,21 @@ jobs:
       - name: Run tests
         run: |
           make tests-once
-          bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
+          bash <(curl -s https://codecov.io/bash)
+
+  multiarch_build:
+    needs:
+      - Tests
+    name: Multi-arch build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Checkout source code
+        uses: actions/checkout@v4
+      - name: Build and push Docker image for main branch
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: |
+          make release GOTENBERG_VERSION=edge
\ No newline at end of file