diff --git a/.github/workflows/sidecar.yml b/.github/workflows/sidecar.yml
index b9f95d7..868bc65 100644
--- a/.github/workflows/sidecar.yml
+++ b/.github/workflows/sidecar.yml
@@ -14,21 +14,16 @@ on:
 
 jobs:
   build-images:
-    continue-on-error: true
-
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - release_for: Linux-x86_64
-            build_on: ubuntu-latest
-            suffix: amd
-
-          - release_for: Linux-arm64
-            build_on: ubuntu-arm
-            suffix: arm
-
-    runs-on: ${{ matrix.build_on }}
+          - context: .
+            file: docker/dockerfile.sidecar
+            endpoint: demeter-run/doom-patrol-metrics-exporter
 
+    continue-on-error: true
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.3.3
 
@@ -42,36 +37,8 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: .
-          file: docker/dockerfile.sidecar
+          context: ${{ matrix.context }}
+          file: ${{ matrix.file }}
+          platforms: linux/amd64
           push: true
-          tags: ghcr.io/demeter-run/doom-patrol-metrics-exporter:${{ github.sha }}-${{ matrix.suffix }}
-
-  build-manifest:
-    needs:
-      - build-images
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: docker/metadata-action@v5
-        id: metadata
-        with:
-          images: ghcr.io/demeter-run/doom-patrol-metrics-exporter
-
-      - uses: int128/docker-manifest-create-action@v2
-        id: build
-        with:
-          index-annotations: ${{ steps.metadata.outputs.labels }}
-          tags: |
-            ghcr.io/demeter-run/doom-patrol-metrics-exporter:${{ github.sha }}
-            ghcr.io/demeter-run/doom-patrol-metrics-exporter
-          sources: |
-            ghcr.io/demeter-run/doom-patrol-metrics-exporter:${{ github.sha }}-amd
-            ghcr.io/demeter-run/doom-patrol-metrics-exporter:${{ github.sha }}-arm
+          tags: ghcr.io/${{ matrix.endpoint }},ghcr.io/${{ matrix.endpoint }}:${{ github.sha }}