diff --git a/cli/.goreleaser.yaml b/cli/.goreleaser.yaml
index 06dcbb9d15d993..7c80873eca7a8b 100644
--- a/cli/.goreleaser.yaml
+++ b/cli/.goreleaser.yaml
@@ -19,6 +19,19 @@ dockers:
       - "ghcr.io/cloudquery/cloudquery:latest"
       - "ghcr.io/cloudquery/cloudquery:{{.Version}}"
       - "ghcr.io/cloudquery/cloudquery:{{ .Major }}.{{ .Minor }}"
+      - "ghcr.io/cloudquery/cloudquery:latest-{{.Runtime.Goos}}-{{.Runtime.Goarch}}"
+      - "ghcr.io/cloudquery/cloudquery:{{.Version}}-{{.Runtime.Goos}}-{{.Runtime.Goarch}}"
+      - "ghcr.io/cloudquery/cloudquery:{{ .Major }}.{{ .Minor }}-{{.Runtime.Goos}}-{{.Runtime.Goarch}}"
+    build_flag_templates:
+      - "--label=org.opencontainers.image.source=https://github.com/cloudquery/cloudquery"
+  -
+    goos: linux
+    goarch: arm64
+    dockerfile: Dockerfile.goreleaser
+    image_templates:
+      - "ghcr.io/cloudquery/cloudquery:latest-{{.Runtime.Goos}}-{{.Runtime.Goarch}}"
+      - "ghcr.io/cloudquery/cloudquery:{{.Version}}-{{.Runtime.Goos}}-{{.Runtime.Goarch}}"
+      - "ghcr.io/cloudquery/cloudquery:{{ .Major }}.{{ .Minor }}-{{.Runtime.Goos}}-{{.Runtime.Goarch}}"
     build_flag_templates:
       - "--label=org.opencontainers.image.source=https://github.com/cloudquery/cloudquery"