diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4dcb123..db1da3e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -62,6 +62,7 @@ jobs:
       with:
         push: true
         tags: tsuru/deploy-agent:latest
+        platforms: linux/amd64,linux/arm64
 
   release:
     if: github.event_name != 'pull_request' && github.repository == 'tsuru/deploy-agent' && startsWith(github.ref, 'refs/tags/')
diff --git a/goreleaser.yaml b/goreleaser.yaml
index f0658d8..07798fb 100644
--- a/goreleaser.yaml
+++ b/goreleaser.yaml
@@ -15,10 +15,12 @@ builds:
   - 7
 
 dockers:
-- id: deploy-agent-linux-amd64
+- id: deploy-agent-linux
   dockerfile: Dockerfile.goreleaser
   goos: linux
-  goarch: amd64
+  goarch:
+  - amd64
+  - arm64
   build_flag_templates:
   - --pull
   - --label=org.opencontainers.image.created={{ .Date }}