diff --git a/.github/workflows/build-wasm-simd-image-from-tag.yml b/.github/workflows/build-wasm-simd-image-from-tag.yml
index 7cef57de825..c85c210950e 100644
--- a/.github/workflows/build-wasm-simd-image-from-tag.yml
+++ b/.github/workflows/build-wasm-simd-image-from-tag.yml
@@ -8,52 +8,92 @@ on:
         type: string
 
 env:
-   REGISTRY: ghcr.io
-   ORG: cosmos
-   IMAGE_NAME: ibc-go-wasm-simd
-   GIT_TAG: "${{ inputs.tag }}"
+  REGISTRY: ghcr.io
+  ORG: cosmos
+  IMAGE_NAME: ibc-go-wasm-simd
+  GIT_TAG: "${{ inputs.tag }}"
 
 jobs:
-   build-image-at-tag:
-      runs-on: ubuntu-latest
-      permissions:
-        packages: write
-        contents: read
-      steps:
-         - uses: actions/checkout@v4
-           with:
-            ref: "${{ env.GIT_TAG }}"
-            fetch-depth: 0
-
-         - uses: actions/setup-python@v5
-           with:
-             python-version: '3.10'
-         - name: Install dependencies
-           run: make python-install-deps
-
-         - name: Set up QEMU
-           uses: docker/setup-qemu-action@v3
-         - name: Set up Docker Buildx
-           uses: docker/setup-buildx-action@v3
-         - name: Log in to the Container registry
-           uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
-           with:
-              registry: ${{ env.REGISTRY }}
-              username: ${{ github.actor }}
-              password: ${{ secrets.GITHUB_TOKEN }}
-
-         - name: Get arguments and docker tag
-           run: |
-              echo "LIBWASM_VERSION=$(scripts/get-libwasm-version.py --get-version)" >> $GITHUB_ENV
-              # remove all `/` or `+` characters from the docker tag and replace them with a -.
-              # this ensures the docker tag is valid.
-              echo "DOCKER_TAG=$(echo $GIT_TAG | sed 's/[^a-zA-Z0-9\.]/-/g')" >> $GITHUB_ENV
-
-         - name: Build and push
-           uses: docker/build-push-action@v6
-           with:
-             platforms: linux/amd64,linux/arm64,
-             push: true
-             tags: ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.DOCKER_TAG }}
-             file: modules/light-clients/08-wasm/Dockerfile
-             build-args: LIBWASM_VERSION=${{ env.LIBWASM_VERSION }}
+  build-image-at-tag:
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+          - os: ubuntu-latest
+            platform: linux/amd64
+          - os: macos-latest
+            platform: linux/arm64
+    runs-on: {{ matrix.build.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+         ref: "${{ env.GIT_TAG }}"
+         fetch-depth: 0
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Install dependencies
+        run: make python-install-deps
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        with:
+           registry: ${{ env.REGISTRY }}
+           username: ${{ github.actor }}
+           password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get arguments
+        run: echo "LIBWASM_VERSION=$(scripts/get-libwasm-version.py --get-version)" >> $GITHUB_ENV
+
+      - name: Build and push
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          platforms: ${{ matrix.build.platform }}
+          file: modules/light-clients/08-wasm/Dockerfile
+          build-args: LIBWASM_VERSION=${{ env.LIBWASM_VERSION }}
+          outputs: type=image,"name=${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}",push-by-digest=true,name-canonical=true,push=true
+
+      - name: Export digest
+        run: |
+          mkdir -p ${{ runner.temp }}/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ matrix.build.os }} # If we end up running more builds on the same OS, we need to differentiate more here
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Get docker tag
+         # remove all `/` or `+` characters from the docker tag and replace them with a -.
+         # this ensures the docker tag is valid.
+        run: echo "DOCKER_TAG=$(echo $GIT_TAG | sed 's/[^a-zA-Z0-9\.]/-/g')" >> $GITHUB_ENV
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        with:
+           registry: ${{ env.REGISTRY }}
+           username: ${{ github.actor }}
+           password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create --tag ${{ env.DOCKER_TAG }} $(printf '${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)