diff --git a/.gitignore b/.gitignore
index f4db106b5..b7c784b66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,4 +48,7 @@ profile.cov
 /dashboard/assets/package-lock.json
 
 **/yarn-error.log
-logs/
\ No newline at end of file
+logs/
+
+# goreleaser
+/dist
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 2fbaa2f79..861cd0e01 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -95,9 +95,33 @@ dockers:
     build_flag_templates:
       - --platform=linux/amd64
     image_templates:
-      - "flashbots/suave-geth:{{ .ShortCommit }}"
-      - "flashbots/suave-geth:{{ .Tag }}"
-      - "flashbots/suave-geth:latest"
+      - "flashbots/suave-geth:{{ .ShortCommit }}-amd64"
+      - "flashbots/suave-geth:{{ .Tag }}-amd64"
+      - "flashbots/suave-geth:latest-amd64"
+  - dockerfile: ./Dockerfile.suave
+    use: buildx
+    goarch: arm64
+    goos: linux
+    build_flag_templates:
+      - --platform=linux/arm64
+    image_templates:
+      - "flashbots/suave-geth:{{ .ShortCommit }}-arm64"
+      - "flashbots/suave-geth:{{ .Tag }}-arm64"
+      - "flashbots/suave-geth:latest-arm64"
+
+docker_manifests:
+  - name_template: "flashbots/suave-geth:{{ .ShortCommit }}"
+    image_templates:
+      - "flashbots/suave-geth:{{ .ShortCommit }}-amd64"
+      - "flashbots/suave-geth:{{ .ShortCommit }}-arm64"
+  - name_template: "flashbots/suave-geth:{{ .Tag }}"
+    image_templates:
+      - "flashbots/suave-geth:{{ .Tag }}-amd64"
+      - "flashbots/suave-geth:{{ .Tag }}-arm64"
+  - name_template: "flashbots/suave-geth:latest"
+    image_templates:
+      - "flashbots/suave-geth:latest-amd64"
+      - "flashbots/suave-geth:latest-arm64"
 
 checksum:
   name_template: "checksums.txt"
diff --git a/Makefile b/Makefile
index 4d2312551..7b91be935 100644
--- a/Makefile
+++ b/Makefile
@@ -66,4 +66,4 @@ release:
 		-v `pwd`/sysroot:/sysroot \
 		-w /go/src/$(PACKAGE_NAME) \
 		ghcr.io/goreleaser/goreleaser-cross:v1.19.5 \
-		release --clean
+		release --clean --auto-snapshot