diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 73182e6f..c8824725 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -69,12 +69,24 @@ jobs:
         run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
 
       - name: Log in to ghcr.io
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
 
       - name: Build and push
-        run: |
-          docker buildx build --push \
-            --platform linux/amd64,linux/arm64 \
-            -t "ghcr.io/spinloop-ai/agent:${{ steps.tag.outputs.version }}" \
-            -t ghcr.io/spinloop-ai/agent:latest \
-            images/agent
+        uses: docker/build-push-action@v7
+        with:
+          context: images/agent
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/spinloop-ai/agent:${{ steps.tag.outputs.version }}
+            ghcr.io/spinloop-ai/agent:latest