diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d087246..c9519e4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -73,4 +73,4 @@ jobs:
         run: |
           curl -sL https://git.io/goreleaser | bash -s -- --parallelism=2
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index b662d3b..b3150fe 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -119,6 +119,7 @@ dockers:
       - "ghcr.io/autotag-dev/autotag:v{{ .Major }}-amd64" # v1-amd64
       - "ghcr.io/autotag-dev/autotag:v{{ .Major }}.{{ .Minor }}-amd64" # v1.0-amd64
       - "ghcr.io/autotag-dev/autotag:latest-amd64"
+    goarch: amd64
 
   - dockerfile: Dockerfile
     use: buildx
@@ -130,6 +131,7 @@ dockers:
       - "ghcr.io/autotag-dev/autotag:v{{ .Major }}-arm64" # v1-arm64
       - "ghcr.io/autotag-dev/autotag:v{{ .Major }}.{{ .Minor }}-arm64" # v1.0-arm64
       - "ghcr.io/autotag-dev/autotag:latest-arm64"
+    goarch: arm64
 
 # use `docker_manifests` section to create combined multi-arch image manifests:
 docker_manifests:
@@ -138,12 +140,12 @@ docker_manifests:
       - "ghcr.io/autotag-dev/autotag:{{ .Tag }}-amd64"
       - "ghcr.io/autotag-dev/autotag:{{ .Tag }}-arm64"
 
-  - name_template: "ghcr.io/autotag-dev/autotag:{{ .Major }}"
+  - name_template: "ghcr.io/autotag-dev/autotag:v{{ .Major }}"
     image_templates:
-      - "ghcr.io/autotag-dev/autotag:{{ .Major }}-amd64"
-      - "ghcr.io/autotag-dev/autotag:{{ .Major }}-arm64"
+      - "ghcr.io/autotag-dev/autotag:v{{ .Major }}-amd64"
+      - "ghcr.io/autotag-dev/autotag:v{{ .Major }}-arm64"
 
-  - name_template: "ghcr.io/autotag-dev/autotag:{{ .Major }}.{{ .Minor }}"
+  - name_template: "ghcr.io/autotag-dev/autotag:v{{ .Major }}.{{ .Minor }}"
     image_templates:
       - "ghcr.io/autotag-dev/autotag:v{{ .Major }}.{{ .Minor }}-amd64"
       - "ghcr.io/autotag-dev/autotag:v{{ .Major }}.{{ .Minor }}-arm64"