diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 37455609..7cd6eca6 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -53,10 +53,10 @@ dockers:
   - skip_push: auto
     use: buildx
     image_templates:
-      - "omissis/go-jsonschema:latest"
-      - "omissis/go-jsonschema:{{ .Major }}"
-      - "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}"
-      - "omissis/go-jsonschema:{{ .Version }}"
+      - "omissis/go-jsonschema:latest-amd64"
+      - "omissis/go-jsonschema:{{ .Major }}-amd64"
+      - "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}-amd64"
+      - "omissis/go-jsonschema:{{ .Version }}-amd64"
     build_flag_templates:
       - "--target=go-jsonschema"
       - "--label=org.opencontainers.image.created={{.Date}}"
@@ -68,10 +68,10 @@ dockers:
   - skip_push: auto
     use: buildx
     image_templates:
-      - "omissis/go-jsonschema:latest"
-      - "omissis/go-jsonschema:{{ .Major }}"
-      - "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}"
-      - "omissis/go-jsonschema:{{ .Version }}"
+      - "omissis/go-jsonschema:latest-arm64v8"
+      - "omissis/go-jsonschema:{{ .Major }}-arm64v8"
+      - "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}-arm64v8"
+      - "omissis/go-jsonschema:{{ .Version }}-arm64v8"
     build_flag_templates:
       - "--target=go-jsonschema"
       - "--label=org.opencontainers.image.created={{.Date}}"
@@ -81,6 +81,21 @@ dockers:
       - "--platform=linux/arm64/v8"
     goarch: arm64
 docker_manifests:
+- skip_push: auto
+  name_template: "omissis/go-jsonschema:latest"
+  image_templates:
+  - "omissis/go-jsonschema:latest-amd64"
+  - "omissis/go-jsonschema:latest-arm64v8"
+- skip_push: auto
+  name_template: "omissis/go-jsonschema:{{ .Major }}"
+  image_templates:
+  - "omissis/go-jsonschema:{{ .Major }}-amd64"
+  - "omissis/go-jsonschema:{{ .Major }}-arm64v8"
+- skip_push: auto
+  name_template: "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}"
+  image_templates:
+  - "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}-amd64"
+  - "omissis/go-jsonschema:{{ .Major }}.{{ .Minor }}-arm64v8"
 - skip_push: auto
   name_template: "omissis/go-jsonschema:{{ .Version }}"
   image_templates: