diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dd46360..f48ffa6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: Publish
 on:
   push:
     branches: [main]
-    tags: ['v*']
+    tags: ["v*"]
   workflow_dispatch:
 
 env:
@@ -20,6 +20,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - 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 Container Registry
         uses: docker/login-action@v3
         with:
@@ -42,6 +48,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -60,6 +67,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: docker/s3fs
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.s3fs-meta.outputs.tags }}
           labels: ${{ steps.s3fs-meta.outputs.labels }}
diff --git a/README.md b/README.md
index 40e0ddb..1a755fe 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,14 @@ A Kubernetes operator for deploying [marimo](https://github.com/marimo-team/mari
 
 ## Installation
 
+### Supported Architectures
+
+The operator and s3fs images are built for multiple architectures:
+- **linux/amd64** (x86_64)
+- **linux/arm64** (aarch64)
+
+Docker will automatically pull the correct image for your platform.
+
 ```bash
 # Option 1: Install from single manifest
 kubectl apply -f https://raw.githubusercontent.com/marimo-team/marimo-operator/main/deploy/install.yaml