diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 686e509..ea81a97 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     if: ${{ always() && github.event_name == 'pull_request' }}
     needs:
       - build
-      - build-docker
+      - build-docker-x86
       - build-docker-arm64
       - upload-docker-prebuilt
       - upload-docker-src
@@ -24,6 +24,7 @@ jobs:
     steps:
       - uses: re-actors/alls-green@release/v1
         with:
+          allowed-skips: build-docker-x86, build-docker-arm64, upload-docker-prebuilt, upload-docker-src
           jobs: ${{ toJSON(needs) }}
   build:
     strategy:
@@ -269,7 +270,7 @@ jobs:
           name: proxy-scraper-checker-${{ matrix.target }}
           path: dist/
           if-no-files-found: error
-  build-docker:
+  build-docker-x86:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-24.04
     permissions:
@@ -285,7 +286,7 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
-            type=raw,value=${{ github.sha }}
+            type=raw,value=${{ github.sha }}-x86
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -322,7 +323,7 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
-            type=raw,value=${{ github.sha }}
+            type=raw,value=${{ github.sha }}-arm
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -345,7 +346,7 @@ jobs:
           push-to-registry: true
   upload-docker-prebuilt:
     needs:
-      - build-docker
+      - build-docker-x86
       - build-docker-arm64
     permissions:
       attestations: write
@@ -359,6 +360,13 @@ jobs:
           - arm-v7
           - arm64-v8
     steps:
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - run: docker manifest create ghcr.io/${{ github.repository }}:${{ github.sha }} ghcr.io/${{ github.repository }}:${{ github.sha }}-x86 ghcr.io/${{ github.repository }}:${{ github.sha }}-arm
+      - run: docker manifest push ghcr.io/${{ github.repository }}:${{ github.sha }}
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
@@ -394,7 +402,7 @@ jobs:
           if-no-files-found: error
   upload-docker-src:
     needs:
-      - build-docker
+      - build-docker-x86
       - build-docker-arm64
     strategy:
       matrix: